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

Browse Source

am: 9017dc6c0a -s ours
am skip reason: subject contains skip directive

Change-Id: I37b613d8e2381d6909be8df04c26cb948f7b4a06

...

This commit is contained in:

Jonathan Scott

2019-05-08 14:30:52 -07:00

committed by android-build-merger

parent b16b6dbd61 9017dc6c0a

commit 3935966a7e

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