summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Winson Chung <winsonc@google.com> 2022-10-20 00:33:09 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-20 00:33:09 +0000
commit783c43fcc8454a68e36491277094c8ed984b247f (patch)
treece7d9aa3f77a26be4e572c161a348726c31e77b5 /libs/androidfw/StringPool.cpp
parent859e6eeb8b8633e9daceb8bff091b03f79683639 (diff)
parent4805f106a1759ca8e7d129f2affdba6343cf32f8 (diff)
[automerger skipped] Merge "Backport missing permission check for querying main activity intent" into sc-dev am: 967cdc5544 -s ours am: 89e0dcf643 -s ours am: db451d7bf3 -s ours am: 43c14f53f2 -s ours am: 4805f106a1 -s ours
am skip reason: Merged-In Ib233ad754a6c6e3c4e0d0e10ed788ab8e055cccc with SHA-1 b319280964 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20218918 Change-Id: Ida81e1d6c72a41edc72abb51076f3f6eb33d88b0 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