[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev

Browse Source

am: db98a8edec -s ours
am skip reason: subject contains skip directive

Change-Id: Ibd95dd35f7efcc5d2605799bfa65b3b296be7d88

...

This commit is contained in:

Jonathan Scott

2019-05-08 13:17:58 -07:00

committed by android-build-merger

parent 2ace95f386 db98a8edec

commit 019e435e87

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