diff options
| author | 2023-11-21 00:31:16 +0000 | |
|---|---|---|
| committer | 2023-11-21 00:31:16 +0000 | |
| commit | 5cd1f906dce40b1957d95c2b4c0079c1a1860c28 (patch) | |
| tree | f67381be8a75295906cbdd7e7a17046b9d342b31 /libs/androidfw/FileStream.cpp | |
| parent | 75153576f884d79ec1886e8d9274c16757836f2f (diff) | |
| parent | a2637dcfd9aebfb46452303061c620ff4f6378b3 (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: 3c8b4759cc -s ours am: 4e81397655 -s ours am: 41f0b2f410 -s ours am: 740fee5cf6 -s ours am: 2308a75533 -s ours am: a2637dcfd9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25329531
Change-Id: Ieff6f7e8773656614d46f9b1e1bebee3576ad749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions