summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Iván Budnik <ivanbuper@google.com> 2022-11-04 19:13:40 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-04 19:13:40 +0000
commit28f0b43a6e0f575bf74db3d1f17541f012a21ee2 (patch)
tree3b45ab73498103092644c10cab6ac6c0459cecc5 /libs/androidfw/AssetsProvider.cpp
parentef33f4c1c856cc9c965adda1fa0f393e16c45fba (diff)
parent1d569978b7aafff6848e44b035b2420b2f08eb2a (diff)
[automerger skipped] Merge "Enforce MediaButtonReceiver ComponentName belongs to app" into sc-dev am: 047202c00b -s ours am: 1d569978b7 -s ours
am skip reason: Merged-In I4aba866a9758366175ea4af0d434729ad98fa48d with SHA-1 863d396f4c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20272083 Change-Id: I4a6d007b0ac9ba5139a379e28b32fc379619b21c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions