summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-10-28 08:27:59 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-28 08:27:59 +0000
commit1d767e38c4962dcf513e187bb03665aaf236c2f3 (patch)
tree935f9de236446ec73f9e9072487ec91586bdb9c3 /libs/androidfw/StringPool.cpp
parent51542399668e535076e8714a01fcd8ea520209c6 (diff)
parentf159e43b0961ebda88c019cdc7d6abf12af3080e (diff)
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" into qt-dev am: 191036a989 am: 70536c0199 -s ours am: bdf427e3a0 -s ours am: b4b3e02753 -s ours am: e7ab5c3f24 -s ours am: 1d806d66fe -s ours am: b7356c1c84 -s ours am: 84ead264f8 -s ours am: d830baa11c -s ours am: f159e43b09 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20223219 Change-Id: If5aa8cd4b300b0dd5e317fd31517f0376b8aa709 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