diff options
| author | 2023-08-28 19:52:20 +0000 | |
|---|---|---|
| committer | 2023-08-28 19:52:20 +0000 | |
| commit | eb95777f2dfbe3a849002619d34070af8deb0d3b (patch) | |
| tree | 27ede1b08aa7a19dcdf9a15ad6337cbb9ccc07dd /libs/androidfw/FileStream.cpp | |
| parent | b333cd81c1a27b81c704aefbbdb512c875c4a200 (diff) | |
| parent | 8396238a06caafe0eaba71ee28fb11a6962195f7 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Unset StrongAuthFlags when unlocking a user profile" into tm-dev am: 5233950a66 am: 4090ce85f5 -s ours am: c4579e00df -s ours am: 1875efb1c1 -s ours am: 3ebea2bc2e -s ours am: dbea5619b9 -s ours am: 8396238a06 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24270326
Change-Id: Iacf045c4a61f497d9fe9f334ab9575bf74e6d755
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