summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Beverly Tai <beverlyt@google.com> 2023-10-02 21:35:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-02 21:35:58 +0000
commit03caa3dc1a2c564a5c5df389fd76dfe0bc721ba0 (patch)
tree32509152093be4a1acc7902196ee1bcfd70584c4 /libs/androidfw/ObbFile.cpp
parentc6775f5262bf7a3c5d0031bebac68322fd7f39af (diff)
parente7ec6b0aa0f6ac2643d7f5788c53b87bc89a1970 (diff)
[automerger skipped] Revert "On device lockdown, always show the keyguard" am: 996896e672 -s ours am: 12913fd327 -s ours am: 3afc843a65 -s ours am: e7ec6b0aa0 -s ours
am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 b23c2d5fb6 is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24757286 Change-Id: Id2d8f81b98261b11291c18b3dd3c6dce53f3521e 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