| commit | aa805d1ff6cba73788b84255a34e5fe3e6da55af | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Fri Sep 15 21:40:23 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 21:40:23 2023 +0000 |
| tree | 305ee5f9fa7217500e5f5ebd7bf05f904137e5bf | |
| parent | a79a951cf8e106eced7d08c1667f167d4aa9c7b5 [diff] | |
| parent | 13f4d4f47161896862d1cc03abce63dcd4f3145a [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-qpr-dev am: 324d8033ba am: 4397e74103 am: 89a3862e5d am: 8aaad2a211 am: c4e7a6081e am: 17405aa591 am: 13f4d4f471 -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/+/24341230 Change-Id: I2b399a0920063d7cf09b335e72448dd0fc44cac6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>