diff options
| author | 2023-09-15 21:42:43 +0000 | |
|---|---|---|
| committer | 2023-09-15 21:42:43 +0000 | |
| commit | eb4fd282c7aab0623dbb45ae4bcef2885f1a7def (patch) | |
| tree | aad25af4559d92a8c563c7fc90ccf7de8e357759 /libs/androidfw/StringPool.cpp | |
| parent | bd6c94ced7e62e4c0a9c23251e192133152e194a (diff) | |
| parent | ff53f5a27357e1d609afa0d26e6b3311d109473d (diff) | |
Merge "Require permission to unlock keyguard" into rvc-qpr-dev am: 324d8033ba am: 4397e74103 am: 89a3862e5d am: 8aaad2a211 am: c4e7a6081e am: fa1f3f3cb0 am: ff53f5a273
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24341230
Change-Id: Ieccd16b9486557e909180e1cded04ffb3f2e0939
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions