summaryrefslogtreecommitdiff
path: root/libs/androidfw/misc.cpp
diff options
context:
space:
mode:
author Marzia Favaro <marziana@google.com> 2023-09-18 20:25:53 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-18 20:25:53 +0000
commit1d42887320cd0017d43697976ff65a6a48270bf8 (patch)
treea731a05dd2f75880024316c60d3b8f8393fc0541 /libs/androidfw/misc.cpp
parent5efd73bc0fae693bb4a5d1abd2ef959ec854427b (diff)
parent5e35aad2a2a6cfe98f23472da002b8badaaf1ec0 (diff)
[automerger skipped] Require permission to unlock keyguard am: 41bc7c0042 -s ours am: 1bedc66ed3 -s ours am: 5e35aad2a2 -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1dc5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342145 Change-Id: I14f25800085015b9dd1dcf6d889e595ad0b53583 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/misc.cpp')
0 files changed, 0 insertions, 0 deletions