diff options
| author | 2023-09-15 22:38:09 +0000 | |
|---|---|---|
| committer | 2023-09-15 22:38:09 +0000 | |
| commit | 3d18546a627458ab0f63990a3c6d15ace860e77e (patch) | |
| tree | 58bb8fca07ec3990d0219447fdd61fac64474c6c /libs/androidfw/ObbFile.cpp | |
| parent | e5ec0c6e37adb5e14f9419d35a8c1ef109281ddf (diff) | |
| parent | 0084bb7961f3246fa41d223cf106616d31df0166 (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-dev am: 78b272400f -s ours am: 30316315ae -s ours am: 8ba2179244 -s ours am: f72e484da4 -s ours am: 790fbfb359 -s ours am: 8dd736d39c -s ours am: 899dc4ee82 -s ours am: a79a951cf8 -s ours am: 0084bb7961 -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1dc5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24341231
Change-Id: I9d1fb6f93019cf92037632b349fbc8f94291ac17
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