Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev am: db98a8edec -s ours

Browse Source

am: 1fd7dfb12e

Change-Id: I03df9a96487204ca7b6bf1f3c15fbfe2b2397cad

...

This commit is contained in:

Jonathan Scott

2019-05-08 14:00:15 -07:00

committed by android-build-merger

parent c1c2a98c51 1fd7dfb12e

commit 9017dc6c0a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available