summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Guojing Yuan <guojing@google.com> 2024-04-03 19:03:11 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-04-03 19:03:11 +0000
commitca1ed38f146ced6feb1e28bfb10f2269dd1d43f8 (patch)
tree01593bf78c1d61d886c5216186479fdad653ab14 /libs/androidfw/StringPool.cpp
parent11b0ff5a0ff713c90cc5e09d3c44da26b1dc1b58 (diff)
parent14359bbd1f722545f1c5d023164821020a00149c (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 skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26666072 Change-Id: Ic5cf13d4863e1fdb536f24f607945d953d052039 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