summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Yuri Lin <yurilin@google.com> 2022-11-09 21:36:21 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-09 21:36:21 +0000
commit18793fa98624cf5b92693430fdbca5d4affc8214 (patch)
tree0587e3866717c8ed350212261c17a75062c2daf2 /libs/androidfw/StringPool.cpp
parent4d22dceeaeb78bad474297b235c2c2f79425cce5 (diff)
parentd4b206afa10f4fb919ab7fe6c2498bd5cd32cf8c (diff)
[automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into tm-dev am: b1ace5c498 -s ours am: 5a289d4b3e -s ours am: d4b206afa1 -s ours
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 d9ead5f42c is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20404109 Change-Id: I10b34013765ee7c666f3e8815ab173b9f6a71472 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