diff options
| author | 2023-10-02 21:34:14 +0000 | |
|---|---|---|
| committer | 2023-10-02 21:34:14 +0000 | |
| commit | a873f5dbd78713a3845a1c63224815843f6e8236 (patch) | |
| tree | 7a9873d8ef8b3e93bb4ed37038356471af66a2d0 /api/api_test.go | |
| parent | 155481e1e903d62d4d997b0fcad42c0919e642fe (diff) | |
| parent | eca5af7099bcd964eee26c5034d4fc588bf2e55e (diff) | |
[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into sc-v2-dev am: 584df59ac8 -s ours am: 3815edc6e2 -s ours am: 8465fe5d8b -s ours am: 224fa1da3b -s ours am: eca5af7099 -s ours
am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 b23c2d5fb6 is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24757286
Change-Id: I2c4aa959481afe0c1167132cde261568730277e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'api/api_test.go')
0 files changed, 0 insertions, 0 deletions