diff options
| author | 2023-10-04 00:08:28 +0000 | |
|---|---|---|
| committer | 2023-10-04 00:08:28 +0000 | |
| commit | 73c8acd4f8bd88eeda22afe3eb8a266a85a806fb (patch) | |
| tree | 9e10e19e127553152f17b0e4349ee67319dcbaf9 /libs/androidfw/ObbFile.cpp | |
| parent | 2bdd896e14e2db46ffd8462f288c1cd00efa8551 (diff) | |
| parent | 34fdc2a280e3e52d8e14411442f12f99e5162ee6 (diff) | |
Merge "[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into udc-dev am: db65e4d5b8 am: 581a3fe494 -s ours am: 9e9cdd8efe -s ours" into udc-qpr-dev-plus-aosp am: 34fdc2a280 -s ours
am skip reason: Merged-In I70fdae80f717712b3dfc9df54b9649959b4bb8f0 with SHA-1 d9c7c85c52 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24790879
Change-Id: I5f3ead8a9ef39a1de08f69105ed4a0e775cb29ab
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