summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-10-28 06:52:54 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-28 06:52:54 +0000
commitd830baa11c317bbc18b55cd952c9fdf01b0b27f7 (patch)
tree3dd74c44a90b24b88be8a27a058972dcb351395d /libs/androidfw/StringPool.cpp
parenta3376a4608bb75d7512210e19ddd481400d9e603 (diff)
parent84ead264f82d3a2d0713e2f821e2d2c524da142c (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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20223219 Change-Id: I855c0d5bed2121a3aa0443196006021e712e0d11 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