diff options
| author | 2023-11-21 00:30:34 +0000 | |
|---|---|---|
| committer | 2023-11-21 00:30:34 +0000 | |
| commit | d320b590c41dacfa7665aedbc12d21ea3e2b0b59 (patch) | |
| tree | f67381be8a75295906cbdd7e7a17046b9d342b31 /libs/androidfw/AssetsProvider.cpp | |
| parent | 40b17760a4af5735ea0578274ad06749aabef103 (diff) | |
| parent | a8aff0a3e528a4de4575859edf742a2604836f89 (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: 77e4329b13 -s ours am: 030e8bc866 -s ours am: a8aff0a3e5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25329531
Change-Id: I4c964202d8e9759d7ce79d6b29b054c3eab993ff
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