summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Yuri Lin <yurilin@google.com> 2022-11-09 20:55:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-09 20:55:13 +0000
commitd4b206afa10f4fb919ab7fe6c2498bd5cd32cf8c (patch)
treecca056b0ba71acb02e69f3808a6773b4055dcef8 /libs/androidfw/StringPool.cpp
parentfd2cc53bf91fc1d08926e9469a4d1b3902ef63b1 (diff)
parent5a289d4b3e08b8c86276072237baad0e995a8f62 (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 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: I0d07eb843af8c7800667dcda5406d542641378aa 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