diff options
| author | 2023-09-15 21:46:44 +0000 | |
|---|---|---|
| committer | 2023-09-15 21:46:44 +0000 | |
| commit | 0084bb7961f3246fa41d223cf106616d31df0166 (patch) | |
| tree | a731a05dd2f75880024316c60d3b8f8393fc0541 /libs/androidfw/ObbFile.cpp | |
| parent | e03b72452374cdf6f73e2f6aee93af645d39166d (diff) | |
| parent | a79a951cf8e106eced7d08c1667f167d4aa9c7b5 (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 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: If428b225403a54649811a1c0612be50258e30598
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