diff options
| author | 2023-08-28 19:51:02 +0000 | |
|---|---|---|
| committer | 2023-08-28 19:51:02 +0000 | |
| commit | 1a2c28703c3363c2ed1be8d60f6f8ec98d82ddbe (patch) | |
| tree | 27ede1b08aa7a19dcdf9a15ad6337cbb9ccc07dd /libs/androidfw/ApkParsing.cpp | |
| parent | 3343522044ae56e09d586651b242f7330fc7fd8b (diff) | |
| parent | ab97ca1643ef58e628318c3414b4705a7cf47b85 (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: 5ddd699e48 -s ours am: a2708ad8b2 -s ours am: ab97ca1643 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24270326
Change-Id: Iddc451b3b4153a6265d95e8f5c84603420b811c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions