summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Ben Murdoch <benm@google.com> 2024-09-09 13:58:48 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-09-09 13:58:48 +0000
commitbfea6f756a164cc681d800403717869ffe770170 (patch)
treef919fbaf30e216a42f0c8a0543b8f2922a892c3a /libs/androidfw/AssetsProvider.cpp
parent5d8a4d3705a0e8ad93429526fd157b3221a2c750 (diff)
parentd6cd22bfe0913da2efee2a4af33dbc64ffd7d54b (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: 8e00a7da38 -s ours am: d6cd22bfe0 -s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/29024181 Change-Id: I715669260fbcff095ab8a5a08d90da43be24fed3 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