summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Beverly Tai <beverlyt@google.com> 2023-10-03 23:02:51 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-03 23:02:51 +0000
commit58db872749b4c58f381aaccff2d6a4f0ba9a67c0 (patch)
tree37f19edbaafcce153978c2e37e2013c955f304e9 /libs/androidfw/ObbFile.cpp
parent8fcefcb3c302e19349844d3b5e222fdbfc28c1f4 (diff)
parent581a3fe494325b9f7b15ec9e7f0d901742bafa54 (diff)
Merge "Updated: always show the keyguard on device lockdown" into udc-dev am: db65e4d5b8 am: 581a3fe494
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24790879 Change-Id: Ibec6d3c393578002e5880975f29eaa3296d9c395 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