diff options
| author | 2023-09-18 12:29:38 +0000 | |
|---|---|---|
| committer | 2023-09-18 12:29:38 +0000 | |
| commit | 8e87b86453583dc3eb46d7a687b41cad944649e5 (patch) | |
| tree | a00b8a09ce9d60bf33dd7660023b38ee6c1775a7 /libs/androidfw/FileStream.cpp | |
| parent | 7a5c8cda4ff4b4e159afdf29dcf464b1f6b6aaee (diff) | |
| parent | 07731fb247a14ae04d825529060ac1630d856e06 (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into udc-dev am: 07731fb247 -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/+/24339445
Change-Id: I858f89d031c9492f748fd3f2f2c585bc24cd9440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions