summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Marzia Favaro <marziana@google.com> 2023-09-15 22:37:36 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-15 22:37:36 +0000
commit3033244596124bdf9ed2c779dae95338be6561a7 (patch)
tree58bb8fca07ec3990d0219447fdd61fac64474c6c /libs/androidfw/ObbFile.cpp
parent007e73d079b266e52e1383bf5beacf24dae08739 (diff)
parentc3f3831270d867671b5f597983e1c7a9d1d3c97f (diff)
Merge "Require permission to unlock keyguard" into rvc-qpr-dev am: 324d8033ba am: 4397e74103 am: 89a3862e5d am: 8aaad2a211 am: c4e7a6081e am: fa1f3f3cb0 am: ff53f5a273 am: c3f3831270
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24341230 Change-Id: Ib0f69dd86cc3bc2f7c9818ad850b7534b47183cd 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