diff options
| author | 2023-10-02 22:08:43 +0000 | |
|---|---|---|
| committer | 2023-10-02 22:08:43 +0000 | |
| commit | c5a5f53ffa3187168a39f989bd9fa88737264111 (patch) | |
| tree | 3482372e29f773dfa645f76969263812a91b8373 /api/api_test.go | |
| parent | 65a91f301404b145bdaf3b027fdf7e28821b8a7c (diff) | |
| parent | 5cc86d4c7cb65eaf98154dac842fda8c23db1922 (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: a873f5dbd7 -s ours am: 5cc86d4c7c -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: Ibfd097b9eb07d6cee24aa5f4d1ed74989e4fe086
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