diff options
| author | 2023-11-07 19:06:31 +0000 | |
|---|---|---|
| committer | 2023-11-07 19:06:31 +0000 | |
| commit | 8ff62994a0a130025c245d463c1bd680e199862b (patch) | |
| tree | 280d5edea20de6f38736dc6a116e6d089d397013 /libs/androidfw/FileStream.cpp | |
| parent | 09ea4b33a0fbbe91e6fb795fc4ca9a5d2661551a (diff) | |
| parent | 852ad78c0f9d070cd41a3eb3081ab3954fcba738 (diff) | |
[automerger skipped] Merge "DO NOT MERGE Disallow Wallpaper service to launch activity from background." into rvc-dev am: 9c2ddfc6c2 am: 2af67c0c80 -s ours am: c9892a6eb6 -s ours am: d280f3c1bd -s ours am: 1c7010d707 -s ours am: dc294be7b6 -s ours am: 48c28e2f36 -s ours am: fd6ab80bd1 -s ours am: 852ad78c0f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24077613
Change-Id: I3ec31f228b96dd9ae1c920de0851636974b38a52
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