Merge "Merge "Align screen lock options to view start" into oc-dr1-dev am: 5e2e0df356
am: 5faa5ab6ea" into oc-mr1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
1b032d9d39