Merge "Merge "Use correct choose lock password/pattern subtitles" into sc-dev am: 4aa06d7639
am: ec4d101cac
am: ce924dc3fc"
This commit is contained in:
committed by
Android (Google) Code Review
commit
eb09a47f48