summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Winson Chung <winsonc@google.com> 2022-10-20 00:02:51 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-20 00:02:51 +0000
commit4805f106a1759ca8e7d129f2affdba6343cf32f8 (patch)
treea8a068d1503c5c8c780f81abea8f8ea6baa2c282 /libs/androidfw/StringPool.cpp
parentaf07bf292994fd473163eb9295c829a96f1bfa7f (diff)
parent43c14f53f23a933348bc2a0ff4f089e4aaed4500 (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 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: Iec5da97459f28adc4d2d959abf55b640d0605c19 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