| commit | db622b652e9fdf0f4d7f9758437af0e204ddd780 | [log] [tgz] |
|---|---|---|
| author | Beth Thibodeau <ethibodeau@google.com> | Fri Jul 16 02:01:21 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 16 02:01:21 2021 +0000 |
| tree | 442370744a1bf408472e7b386bcf8fe79e31a14d | |
| parent | 496676b5d1f8e5e65ed6e83985d6033ea1fca357 [diff] | |
| parent | 04697f8263c5d76e52e8b6ffb27891c6e3c9cbeb [diff] |
Merge "Always show lockdown button" into sc-dev am: 04697f8263 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15289457 Change-Id: I597e4fb1a795cbb5f50ffaea3f31d717980b1928