summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Nan Wu <wnan@google.com> 2023-11-21 00:29:30 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-21 00:29:30 +0000
commit8a14c62e4ae75172589e362721072138901aa0f2 (patch)
treef67381be8a75295906cbdd7e7a17046b9d342b31 /libs/androidfw/AssetsProvider.cpp
parent3600d7e560319bb58cd48f06b31762580466bd48 (diff)
parent9c900cecdf4dd517ec4e923f21fc7bf97687e6fd (diff)
[automerger skipped] DO NOT MERGE Disallow Wallpaper service to launch activity from background. am: b7b2856de6 -s ours am: 4dec8fea1d -s ours am: b1693fdd0c -s ours am: 4086446baf -s ours am: 46427698e4 -s ours am: 1cf4bfa882 -s ours am: 9c900cecdf -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25329531 Change-Id: Ic9c2c341f066de8b8e4aa873ed44eae75589a7d8 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