summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Yi-an Chen <theianchen@google.com> 2024-05-06 19:59:05 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-05-06 19:59:05 +0000
commit85baabfdf3c340628185f60255dff5f0bec50072 (patch)
treec8dcc474911de6420dd881334beb4e38e003fe4c /libs/androidfw/StringPool.cpp
parent8980c37e901275086d0eedfd4d8ef4bb77189b47 (diff)
parentf63c2b9a1ff6c88050722a35ab8d90741e2d1dd0 (diff)
[automerger skipped] Merge "Fix security vulnerability of non-dynamic permission removal" into sc-dev am: 9ebd148a18 am: f5b1c57be9 am: 90d37aaee3 -s ours am: 33defda53b -s ours am: 2a24e99534 -s ours am: f63c2b9a1f -s ours
am skip reason: Merged-In Ia146d4098643d9c473f8c83d33a8a125a53101fc with SHA-1 0ead58f69f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27073589 Change-Id: Ic5bd52bde79ff917c728cdc52dc6824b8db7ece2 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