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