diff options
| author | 2023-09-15 22:47:31 +0000 | |
|---|---|---|
| committer | 2023-09-15 22:47:31 +0000 | |
| commit | ebcc09797de48f94f5a2a4f746dd329ea89e17b3 (patch) | |
| tree | ea61edc92882f041e979741586ee6684e0005cb5 /libs/androidfw/ObbFile.cpp | |
| parent | 2eca34e02ded9558583035803ecd4c5416fe522b (diff) | |
| parent | bcffca459020f1318fe2ec25274ddd495d559fc1 (diff) | |
[automerger skipped] Require permission to unlock keyguard am: ad8e7e3b1d -s ours am: 5173b7987e -s ours am: ea9e51e3cd -s ours am: 620b89a869 -s ours am: 7c2f597c46 -s ours am: 511dee9523 -s ours am: af0c9c2375 -s ours am: 9aab2e9f1f -s ours am: 8a68b03e84 -s ours am: bcffca4590 -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: Ia52b6c67b2a9a303dac3d70d9b1112902feeb5ae
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