summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Rhed Jao <rhedjao@google.com> 2022-10-05 05:22:41 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-05 05:22:41 +0000
commit4db62c6355b9c457f1864884d8c5a27148bc6e47 (patch)
tree26002bc132650cf5d2f15b729c5fcf9cb008a19b /libs/androidfw/StringPool.cpp
parentb2565c0ab485785bf5bcc5bebad03c8ff54017e2 (diff)
parent3bcd7bacb45b502ace7eea2552748b856441b9d6 (diff)
[automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into qt-dev am: 4727daddff am: 806167eda3 -s ours am: 886fab1952 -s ours am: 3d7a421abf -s ours am: 5211157050 -s ours am: 4faaa465d9 -s ours am: c8ac3211e7 -s ours am: 50f3802f05 -s ours am: 3bcd7bacb4 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20061305 Change-Id: I0d32a78bab335b9657da172b21ba4dfa46957efc 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