diff options
| author | 2023-10-02 21:37:08 +0000 | |
|---|---|---|
| committer | 2023-10-02 21:37:08 +0000 | |
| commit | f298d318b2a22e8167f492e6676a1de1af963964 (patch) | |
| tree | 71fc00c51a402f890be2abbb3736d759fa7428bb /api/api_test.go | |
| parent | f6ed64e1ab57e0a8a199dc5c1d253f61450f9155 (diff) | |
| parent | a873f5dbd78713a3845a1c63224815843f6e8236 (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 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: I8648e0d399f056f6cb5e57216a2d152da2712991
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