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: I780d7f1705898ae80ca6782d8cd37b738712d660

...

This commit is contained in:

Jonathan Scott

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

committed by android-build-merger

parent 5e44c47109 1fd7dfb12e

commit 140898b28b

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