diff options
| author | 2023-08-24 11:35:10 +0000 | |
|---|---|---|
| committer | 2023-08-24 11:35:10 +0000 | |
| commit | 7f2ef61833c0b936e03c1a4a2059e0871fcaa429 (patch) | |
| tree | 5d4d8df64a759878e9291c7e26e3db2da1566bd7 /libs/androidfw/StringPool.cpp | |
| parent | 9f00c7f9ca56cd55fc816b1eed8bfc65a2123599 (diff) | |
| parent | dadc03cdc04939db803e3aece07be64407dd24b6 (diff) | |
[automerger skipped] Merge "Prevent media button receivers targeting activities" into udc-dev am: fe79cdd8ed am: dadc03cdc0 -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: Ic677c5c9b97eebb9f511fff5206d5e75fd12ea71
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