summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Yuri Lin <yurilin@google.com> 2022-09-07 19:04:10 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-07 19:04:10 +0000
commit5bbf6eff4714521dc55ed9593789341a10a235fb (patch)
treee09ff5851b802f65b5307186c713fd8256123c97 /libs/androidfw/StringPool.cpp
parente57a5f2c4ba053ddf7a68dc6c735585991c34692 (diff)
parent99fa10e1b4e2efb4140a4b17984825ab3b5b4313 (diff)
[automerger skipped] Merge "Fix system zen rules by using owner package name if caller is system" into sc-dev am: 74f4246a9f -s ours am: de3c7fc60b -s ours am: bce4bc72a5 -s ours am: 43ac96176d -s ours am: 99fa10e1b4 -s ours
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 78245566a2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19868479 Change-Id: Id94ed092a056712106765d3ebb5f477e5bbad488 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