OSDN Git Service

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour...
authorJonathan Scott <scottjonathan@google.com>
Wed, 8 May 2019 20:17:58 +0000 (13:17 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 May 2019 20:17:58 +0000 (13:17 -0700)
commit019e435e87387cdcd1555cc976d92e703d8483f8
treef105613b9ed4d15ac76863d868a5d5a15ff96dc5
parent2ace95f386605fa679b4e9438039a532ef33ebd5
parentdb98a8edece0583a548e54148a3cd041ad06aebf
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev
am: db98a8edec -s ours
am skip reason: subject contains skip directive

Change-Id: Ibd95dd35f7efcc5d2605799bfa65b3b296be7d88