diff options
| author | 2022-12-01 20:54:45 +0000 | |
|---|---|---|
| committer | 2022-12-01 20:54:45 +0000 | |
| commit | 9dd23923b1595140800ee1c6892ec38fe779ff2a (patch) | |
| tree | b57875885387f71b05ff62655c43ca3dc2baf455 /libs/androidfw/StringPool.cpp | |
| parent | ccf240d42bb883dc674cd3f2063b84730dab41b7 (diff) | |
| parent | e7331ca53cd0ef3501d0b0865ca155c7a3722265 (diff) | |
[conflict] Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into tm-dev am: 0232c797eb am: be808625c3 am: e7331ca53c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20600540
Change-Id: I79eb5f1bc635f8b53b04bbdec5f5dee7602575c7
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