summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Yuri Lin <yurilin@google.com> 2022-11-08 20:29:23 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-08 20:29:23 +0000
commitf80526cbefed96af3d65e3489eb927edab516c46 (patch)
tree92d74c53c156d9e7d2a9de8350211192765160e8 /libs/androidfw/StringPool.cpp
parent6fbb8bd7f2b86577b1ce464e8487f58175267fc9 (diff)
parent1585f7c77db2fa753080ad34ec98cc5bc9b5bcf8 (diff)
[automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into sc-dev am: 1585f7c77d -s ours
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 5c344d8a1f is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19868479 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20404654 Change-Id: Iaac645772e094d6e501c34a8f3be5458514efb1d 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