summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Haining Chen <hainingc@google.com> 2023-08-25 19:00:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-25 19:00:50 +0000
commit7b3ed0f7f81e2d6fd895743e53cfc47981e9bade (patch)
treeaec310bd99d3579e435997c844ed60debaf317f8 /libs/androidfw/AssetManager2.cpp
parenta90d019c628e091ebff70b2b64b291edaeb78561 (diff)
parent8ff7e27d5e07d54a59ca1b2ab0847d33744679de (diff)
[automerger skipped] RESTRICT AUTOMERGE Unset StrongAuthFlags when unlocking a user profile am: a3e155e806 am: 8ff7e27d5e -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: I131477b4e452bb3174f8e25af5307e39c31f0a56 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