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:
Android Build Merger (Role)
2017-07-31 17:45:32 +00:00
committed by Android (Google) Code Review

Diff Content Not Available