summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Rhed Jao <rhedjao@google.com> 2022-10-05 02:16:15 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-05 02:16:15 +0000
commitd57db4f0b7e618f8bcd662a20e0a38c8a682fb5e (patch)
tree646216461b299712a3a770e7ddd96b74e3cd8d93 /libs/androidfw/StringPool.cpp
parent16e2da45808c34da6e8c58e2cfc2b3b513f852a6 (diff)
parent2999070287ce2bdde303a99bb39b9fe94f29bbec (diff)
[automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into sc-dev am: 4c7c96f6c4 am: b03fbe7f51 -s ours am: 5631164db9 -s ours am: b65b9dc604 -s ours am: 2999070287 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20051190 Change-Id: I87d7b750d8b77c27e25ae492e734883c103cb756 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