summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Yuri Lin <yurilin@google.com> 2022-11-08 23:33:12 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-08 23:33:12 +0000
commit99327141637dec6579a12a71d799e20ce360beed (patch)
tree153f2a9ca9077b86c0561cae3c7b77a3bebcdffe /libs/androidfw/StringPool.cpp
parent51627f8d1bcf2f88385edb54ead0dc22e1b9a2ae (diff)
parentea3101fd998329dd0272c5b4c960953099812837 (diff)
[automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into rvc-dev am: da89ac7e3c -s ours am: 88e833e696 -s ours am: db3a12a93c -s ours am: db778b8ca1 -s ours am: 9c8a89396c -s ours am: 10c7240805 -s ours am: 832ffe184f -s ours am: ea3101fd99 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20406268 Change-Id: Ie67fbe0cfb65bc8575505fa8897fb95bb131dfe8 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