summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Beverly Tai <beverlyt@google.com> 2023-05-16 15:57:02 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-16 15:57:02 +0000
commitd0888dab482510d1c2783a51e0762362bef338ba (patch)
tree14ff5f3213b618ce2a7b5be694d0f72ed9ec863f /libs/androidfw/ApkParsing.cpp
parent34ac6bbd247bbe804fb9b2ad621d3ff4432df0bc (diff)
parentefb376fe398cee8ac7f63d9f9b410d5b6614d93e (diff)
Merge "On device lockdown, always show the keyguard" into rvc-dev am: cc94a5377e am: efb376fe39
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23089588 Change-Id: I5e5de979876e358f90ba86479cf4a4b763b53633 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