diff options
| author | 2023-08-25 21:05:44 +0000 | |
|---|---|---|
| committer | 2023-08-25 21:05:44 +0000 | |
| commit | 4847aca477918f25147a7c77b97c473c9e3c1531 (patch) | |
| tree | a2040d6427ef83c7d9c8a9c097c0f0961328d009 /libs/androidfw/FileStream.cpp | |
| parent | 8396238a06caafe0eaba71ee28fb11a6962195f7 (diff) | |
| parent | 626993f029403086388c14e32f55e292305d8c91 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Unset StrongAuthFlags when unlocking a user profile" into tm-dev am: 5233950a66 am: 7fe090e659 -s ours am: 75a5bd2d00 -s ours am: 95769cd2ef -s ours am: 626993f029 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24270326
Change-Id: Ia1b5ace8d77b7d8e34c1bf149148025c41c00bda
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