diff options
| author | 2023-09-18 22:26:26 +0000 | |
|---|---|---|
| committer | 2023-09-18 22:26:26 +0000 | |
| commit | 1d38f886738c97035bcc02ca43451e86b4f1eabe (patch) | |
| tree | b665ad8977b76f72750ccdac72984896e863f618 /libs/androidfw/Idmap.cpp | |
| parent | cd7f54f18f564e70cc6128e09fe53f1134e21d43 (diff) | |
| parent | 65148119eb17d23e0739123ebc29074b34a4f039 (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into tm-dev am: 1d243469a6 -s ours am: a8da8cbb7f -s ours am: 1cd2cab28c -s ours am: 65148119eb -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/+/24342145
Change-Id: I4d3bf4525056e7f825c4f10b25a0f2d623648bc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/Idmap.cpp')
0 files changed, 0 insertions, 0 deletions