diff options
| author | 2023-09-15 23:35:09 +0000 | |
|---|---|---|
| committer | 2023-09-15 23:35:09 +0000 | |
| commit | e165a80fd40003c6304ce945ba51d0cb1726f8a6 (patch) | |
| tree | 1dd2ced83851a1da529da39caf7aa02811637f9f /libs/androidfw/FileStream.cpp | |
| parent | edf4306330ccaf1eb6da1f00cd08934faad70a80 (diff) | |
| parent | 22d9145e2edd13e9ada1f8eb65be7794e612e1b8 (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: d44156ce71 -s ours am: 22d9145e2e -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: Ie23f3372f78e1495e260c38c926c3980980d1f28
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