summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Yuri Lin <yurilin@google.com> 2022-12-01 19:52:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-01 19:52:50 +0000
commitbae38f8bb3baf0d96b289162880c7376d4228c49 (patch)
tree72574014025e2a52fcf2a941df518ac722453848 /libs/androidfw/StringPool.cpp
parent2f2cc96d763d1cc1d47136c88216184b9cbe7bdb (diff)
parent1ca8706a1165ef22dbf53c2f22fcb395e8f017b7 (diff)
[automerger skipped] Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into sc-dev am: 7dce594bfe -s ours am: 80d04071c0 -s ours am: 39ff7e5333 -s ours am: 1ca8706a11 -s ours
am skip reason: Merged-In I0c4c705cfe5fc875151958957daaf8657fbc21a7 with SHA-1 12372cd9dd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20535026 Change-Id: Ia77748285c0ae56fcdac28685125502a57c6a691 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