summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Beverly Tai <beverlyt@google.com> 2023-10-03 22:29:15 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-03 22:29:15 +0000
commit82d877664bc4cac9e7312e72aeab8fcb8daed20f (patch)
treee2f2c771a021d512077d4fc85ef457c7c141a244 /libs/androidfw/ObbFile.cpp
parent46a074f9721dde8831f9a381863d35235316a56b (diff)
parentdb65e4d5b8c3757f923e3f447d53875dfb84a8e7 (diff)
Merge "Updated: always show the keyguard on device lockdown" into udc-dev am: db65e4d5b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24790879 Change-Id: Ia5472331c384c96c34c89d664704144d1983e4b9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions