diff options
| author | 2023-11-21 23:34:07 +0000 | |
|---|---|---|
| committer | 2023-11-21 23:34:07 +0000 | |
| commit | 6b04493a645d5954f90741e3edad41ce6fd5dd8e (patch) | |
| tree | 4250d36ef7d55654cf9cb6826f3c4a74aa2e8c9b /libs/androidfw/AssetsProvider.cpp | |
| parent | 9633906f8922a4f1c750738b56939a7ad61ed71a (diff) | |
| parent | fb57297040cad3bba7eaa90379d28e4dde7d96c0 (diff) | |
[automerger skipped] Merge "Restrict activity launch when caller is running in the background" into rvc-dev am: dce6a262f7 am: f3e0e019b6 -s ours am: 44cf76a444 -s ours am: a43fce1d35 -s ours am: e8d5e56e47 -s ours am: 192afbf336 -s ours am: a338885858 -s ours am: e4cafeb8e5 -s ours am: 082ab3fc5b -s ours am: fb57297040 -s ours
am skip reason: Merged-In I1a0c13e74622d301866efaca1b5351a6b241ebe5 with SHA-1 d54a64bdf7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23262449
Change-Id: I1d36dab6f569459819f917d24e5ec356e6ae8ed0
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