summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Winson Chung <winsonc@google.com> 2022-10-20 01:01:23 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-20 01:01:23 +0000
commitb03dabdf1df94297c5fab1f5bed60a99bb494ac6 (patch)
tree246f9fd0cdc1ed4fcec0496116ed08d32fccc1bc /libs/androidfw/StringPool.cpp
parent78f02e38474379088d17baf91010b67c1ef5ce78 (diff)
parent783c43fcc8454a68e36491277094c8ed984b247f (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: 783c43fcc8 -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: Ief3b9c91d6634ad737e174486f5ec12a90292193 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