summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Yuri Lin <yurilin@google.com> 2022-12-01 01:23:36 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-01 01:23:36 +0000
commit2e55c7c46fc8fe78de471c4cf69fbe599119c459 (patch)
tree421f57e4d099ded584f514cf12ee49a47cf8e940 /libs/androidfw/StringPool.cpp
parent4b7ee95b74ee13aea936191e6208311923bc33e5 (diff)
parent55f0d8adf1c8d05c39870d3e98c21167b6dcbdae (diff)
[automerger skipped] Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into rvc-dev am: 177cff5975 -s ours am: b44e95c6a0 -s ours am: 4c144d569e -s ours am: 64c4cbbcb7 -s ours am: 55f0d8adf1 -s ours
am skip reason: Merged-In I0c4c705cfe5fc875151958957daaf8657fbc21a7 with SHA-1 b5ec639ba2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20527082 Change-Id: I99ac0749378cde8e598a38444fdcd7ed3b7ff7ba 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