[automerger skipped] [automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6 skipped: 333afb4357 am: bd3672b2d8 am: 9f280a15a2 am: 306ff7e3a9 -s ours am: 550496d236 -s ours

am: 416b49569a

Change-Id: Iddbb3f020c2ffd3693e8c739c6b244ab9da0fdf9
This commit is contained in:
Jonathan Scott
2019-05-08 17:37:42 -07:00
committed by android-build-merger

Diff Content Not Available