summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Ben Murdoch <benm@google.com> 2024-09-09 13:59:08 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-09-09 13:59:08 +0000
commit722b29919f4561262953fff03411cd5dcca37c48 (patch)
treef919fbaf30e216a42f0c8a0543b8f2922a892c3a /libs/androidfw/AssetsProvider.cpp
parent1ec4cab140114e62cfdda753442e9c7ca8890a1c (diff)
parent5dff51708ea687bffbdc22f1dc11571c792afe01 (diff)
[automerger skipped] RESTRICT AUTOMERGE Clear app-provided shortcut icons am: cb890a0619 -s ours am: f97362b8d3 -s ours am: b11c6a0e90 -s ours am: 3a40a71578 -s ours am: 5dff51708e -s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/29072046 Change-Id: I3d2c5ec967943d8e597f01de382ffd3544d37512 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