diff options
| author | 2022-12-02 01:19:50 +0000 | |
|---|---|---|
| committer | 2022-12-02 01:19:50 +0000 | |
| commit | 70c810f1dd1a6f13858d3d0d3f199d928b449a17 (patch) | |
| tree | a3b4cfce2485ced08d8ce726c145f9ad9b8725d3 /libs/androidfw/StringPool.cpp | |
| parent | 8195c3f6ad03250d10079cdf563d1e022e0400f7 (diff) | |
| parent | 1d34dc7cf1c19d1f7074e2565a342e684d2dd1fd (diff) | |
[conflict] Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into tm-dev am: 0232c797eb am: 1d34dc7cf1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20600521
Change-Id: I5318d20b18a018163f39b0f145752235c3684d81
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