diff options
| author | 2023-08-25 19:00:55 +0000 | |
|---|---|---|
| committer | 2023-08-25 19:00:55 +0000 | |
| commit | c4579e00df3438ec0e4d9052fed473d491a73e7f (patch) | |
| tree | aec310bd99d3579e435997c844ed60debaf317f8 /libs/androidfw/AssetManager2.cpp | |
| parent | 7b3ed0f7f81e2d6fd895743e53cfc47981e9bade (diff) | |
| parent | 4090ce85f55e2b28cd6de9158793946373b46168 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Unset StrongAuthFlags when unlocking a user profile" into tm-dev am: 5233950a66 am: 4090ce85f5 -s ours
am skip reason: Merged-In Ic466fc22a5be9047d39194ad42c56dc4a2acb4dc with SHA-1 498867921e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24270326
Change-Id: I7789a17cbb4e6cb729a7596b649bce48a8299287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
0 files changed, 0 insertions, 0 deletions