diff options
| author | 2023-08-24 12:55:05 +0000 | |
|---|---|---|
| committer | 2023-08-24 12:55:05 +0000 | |
| commit | 17c75d9420e2d36d9cfb15b08fabe279b8b85c97 (patch) | |
| tree | 1318994a8f2190dccdb11e302a621df06bb326a5 /libs/androidfw/ZipFileRO.cpp | |
| parent | dce9d2adb559fd0e59c6f678988c935d85f234b6 (diff) | |
| parent | e482c4c1dde439e04aca69c99b3869987be86364 (diff) | |
[automerger skipped] Merge "Merge "Prevent media button receivers targeting activities" into udc-dev am: fe79cdd8ed am: ce5cba3cef" into udc-d1-dev-plus-aosp am: b52934f8da am: e482c4c1dd -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: Ibcb8a3ae22d50d6a06ddea4573de4f06270769cd
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