summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Nan Wu <wnan@google.com> 2023-11-21 00:28:18 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-21 00:28:18 +0000
commit3600d7e560319bb58cd48f06b31762580466bd48 (patch)
treef67381be8a75295906cbdd7e7a17046b9d342b31 /libs/androidfw/AssetsProvider.cpp
parentf8b7756c22742daacaad2ca843b4b9a2043a021d (diff)
parente422fd56ef3ac160061f5cfb93ba660acd033db9 (diff)
[automerger skipped] Merge "DO NOT MERGE Disallow Wallpaper service to launch activity from background." into sc-v2-dev am: 2bb5270437 -s ours am: fc496ffbe4 -s ours am: 811913a928 -s ours am: 7407517df1 -s ours am: 6f4a41293e -s ours am: e422fd56ef -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25329531 Change-Id: I3f50351c7dff137bca250e679c8073a699dd103a 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