summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Yuri Lin <yurilin@google.com> 2022-11-30 21:37:55 +0000
committer Yuri Lin <yurilin@google.com> 2022-11-30 22:21:15 +0000
commitbe808625c3856af3f0a50d96baf1d5b9c608072a (patch)
tree72574014025e2a52fcf2a941df518ac722453848 /libs/androidfw/StringPool.cpp
parent6400fcedad82ffdc824d3edaccc1933976283326 (diff)
parent0232c797eb700b9ee59c7b331685c2b994ce67ac (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 Bug: 260900756 Change-Id: I84dc52c47756520131a949081553b5f2d86fda9a 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