summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Guojing Yuan <guojing@google.com> 2024-04-03 19:19:56 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-04-03 19:19:56 +0000
commitd8ee4d8b7159c241c2e8d330a155b8b171bffadc (patch)
treef0cb168bc88e65a71ff763ae87752c3512c38d16 /libs/androidfw/StringPool.cpp
parent83408a2ed5e629ad494ec4009835d873a88477ba (diff)
parentca1ed38f146ced6feb1e28bfb10f2269dd1d43f8 (diff)
[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt" into sc-dev am: 97cf09bb72 am: 14359bbd1f -s ours am: ca1ed38f14 -s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26666072 Change-Id: If47a81c5334ca0ea00ab83744dd96c5c8383d2f3 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