| commit | 569fb2d2ca5dc8010f70db26dda584f5c608f7bd | [log] [tgz] |
|---|---|---|
| author | Jonathan Scott <scottjonathan@google.com> | Wed May 08 14:29:58 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 08 14:29:58 2019 -0700 |
| tree | 2d8c54f7c61381ca8b2ace265a33450fa35757f3 | |
| parent | 0f6718cc73bb6497d4d300ab99f3cc4fd72448d0 [diff] | |
| parent | 26a1d67642d0c5d1f68b69fc0088664397c5256a [diff] |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make LockTaskController default behaviour match ScreenPinningSettings." into pi-dev am: 0f8423ff59 -s ours am: 5c96be454f am: 26a1d67642 -s ours am skip reason: subject contains skip directive Change-Id: Ib1cb41923711c1cadd66bb0ec820dd6a7edfded3