commit | 5c96be454f6686e3be5f31a20ab05a0198b0393a | [log] [tgz] |
---|---|---|
author | Jonathan Scott <scottjonathan@google.com> | Wed May 08 13:28:03 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed May 08 13:28:03 2019 -0700 |
tree | a0e09ba878bc366ad43d410b0bb501fad9214eb2 | |
parent | 6421f67d388472cd349db67c39146e95b01efd1a [diff] | |
parent | 0f8423ff599a1af7a81763af19e7b2e7081797e4 [diff] |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make LockTaskController default behaviour match ScreenPinningSettings." into pi-dev am: 0f8423ff59 -s ours am skip reason: subject contains skip directive Change-Id: Ie46a3606a283c89a9a6d5fceb25af286c6433b73