summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Ioana Alexandru <aioana@google.com> 2023-05-09 19:05:53 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-09 19:05:53 +0000
commitd533509908d6b1d477b6c55dcc3a097a712a3977 (patch)
tree529e041f7a2be0efb49ce83282a34fd033759a34 /libs/androidfw/StringPool.cpp
parentc1eb70a38ef7ba1ac5c4a3cc16ce57a5b92ae5e7 (diff)
parent52521e07bf9eda82a7e534f2ec2fe95fec13ed3b (diff)
[automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-dev am: eadfe8b90a -s ours am: 52922c7b14 -s ours am: a1e863a33e -s ours am: 099868aa0d -s ours am: e707b58e15 -s ours am: 2e13a4afde -s ours am: 92b4cfb6b6 -s ours am: 52521e07bf -s ours
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908034 Change-Id: Id4d26573493f18d6a9873f2b9f767a04276615af 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