diff options
| author | 2023-09-18 20:23:04 +0000 | |
|---|---|---|
| committer | 2023-09-18 20:23:04 +0000 | |
| commit | 65148119eb17d23e0739123ebc29074b34a4f039 (patch) | |
| tree | 65e1358bf8c677a85c631bd0cdeaa641403da81c /libs/androidfw/ConfigDescription.cpp | |
| parent | a8fc48c13b2a592999571581282c46dea97f184f (diff) | |
| parent | 1cd2cab28cba5bfc3db8dd5678f462bfb2e0cb2d (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 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: Ib32ae369433700457e1834659d5e0582ddbab061
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ConfigDescription.cpp')
0 files changed, 0 insertions, 0 deletions