summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Miguel Aranda <miguelaranda@google.com> 2023-05-26 16:36:17 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-26 16:36:17 +0000
commit5a66955fd976911b0a813bd1de46012159ce7b46 (patch)
tree1fc68c9cff24f6644c04cc7dadb6800d3b8fd841 /libs/androidfw/StringPool.cpp
parent59bad085c32600d2e8b638df787614c3b4fad3c7 (diff)
parentc3247ddf9d72f271e6da84be83114bdb0d2f62a1 (diff)
[automerger skipped] Merge "Revert "Verify URI permissions in MediaMetadata"" into tm-dev am: 3f7b95fcfd am: c3247ddf9d -s ours
am skip reason: Merged-In I384f8e230c909d8fc8e5f147e2fd3558fec44626 with SHA-1 4ddfad255f is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23183176 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23451199 Change-Id: I80f9b6e9ca26663bc5e2ed6808b3ebc68144ddce 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