diff options
| author | 2022-11-30 21:37:33 +0000 | |
|---|---|---|
| committer | 2022-11-30 22:26:06 +0000 | |
| commit | 1d34dc7cf1c19d1f7074e2565a342e684d2dd1fd (patch) | |
| tree | 6743de164243215989c7705702886d2e0070eb4e /libs/androidfw/StringPool.cpp | |
| parent | 27393bb410c084e4b369e04d492bc7f34a5019b3 (diff) | |
| parent | 0232c797eb700b9ee59c7b331685c2b994ce67ac (diff) | |
[conflict] Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into tm-dev am: 0232c797eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20506676
Change-Id: I20a759905063d95e44cc5e65c09f43407175cddb
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