summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Iván Budnik <ivanbuper@google.com> 2023-08-24 12:51:44 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-24 12:51:44 +0000
commitdce9d2adb559fd0e59c6f678988c935d85f234b6 (patch)
tree1318994a8f2190dccdb11e302a621df06bb326a5 /libs/androidfw/ZipFileRO.cpp
parentab6e84bc92ed34d5967deafcd845d29b7c3005a2 (diff)
parent1c789ac4585fb66970e167cd81557400ccc8a007 (diff)
[automerger skipped] Merge "Prevent media button receivers targeting activities" into udc-dev am: fe79cdd8ed am: 8b3d9dbffb am: 7bc900e494 am: 1c789ac458 -s ours
am skip reason: Merged-In I07c2521f3d97f94e245a25bbb6f49f75cf54a808 with SHA-1 fda5a94aaf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24444452 Change-Id: I3443ce5d8d31b03ed2743dfd7a3aaae3165ad50c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions