summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Nan Wu <wnan@google.com> 2023-09-05 16:48:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-05 16:48:14 +0000
commit634e30ace5d627abd555a9a1f7c978d667724ef6 (patch)
treecd97f96e46b2405f3e1d68614e8b856b87be4d3a /libs/androidfw/AssetsProvider.cpp
parent48570b4b4b778a660b57731172b9475bc0f2adc2 (diff)
parentcd4a8db7e4e3ca27224d8692065d6771e3c7035b (diff)
[automerger skipped] Merge "Rescind BAL privilege when ShortcutService sends the callback PI" into udc-dev am: 4c452c359c am: 3135208164 -s ours am: cd4a8db7e4 -s ours
am skip reason: Merged-In I2df9de272192c9a149a9ff519c96e6e0e8304040 with SHA-1 0a0778e96d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24005105 Change-Id: I77a4ce442110455bb777b34c88be82b8a6b1d44b 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