diff options
| author | 2022-12-01 20:19:14 +0000 | |
|---|---|---|
| committer | 2022-12-01 20:19:14 +0000 | |
| commit | e7331ca53cd0ef3501d0b0865ca155c7a3722265 (patch) | |
| tree | 84527be047251605ab2874379fbc21808fc33c9c /libs/androidfw/StringPool.cpp | |
| parent | 7f33108dd6803736cae1e54cea9efafbc6d9c76d (diff) | |
| parent | be808625c3856af3f0a50d96baf1d5b9c608072a (diff) | |
[conflict] Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into tm-dev am: 0232c797eb am: be808625c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20600540
Change-Id: I02c300fa04b0d08e9dc9dc7393b3496edabb38c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions