summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Ben Murdoch <benm@google.com> 2024-09-09 13:59:22 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-09-09 13:59:22 +0000
commit70af9db01635344744de646cbd53e03e555b91e8 (patch)
treef919fbaf30e216a42f0c8a0543b8f2922a892c3a /libs/androidfw/AssetsProvider.cpp
parent722b29919f4561262953fff03411cd5dcca37c48 (diff)
parent2271426786ea23648469914177d9d68fd540287e (diff)
[automerger skipped] RESTRICT AUTOMERGE Clear app-provided shortcut icons am: 1e17745889 am: 4c91b1ad7b -s ours am: 9b8bef0765 -s ours am: 629f729ecf -s ours am: cb5e1e2ca1 -s ours am: 006be46cc6 -s ours am: 2271426786 -s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/29024181 Change-Id: I3eff5aa6aef89338f0409d34560fe7e66bb55d4e 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