Maurice Lam 1dfd5b8f49 Merge "Rename buttons in lock screen setup" into oc-dr1-dev am: fbfca43e6e ...

am: 57e61ba4f3

Change-Id: Id070948b2fb600509c0b62f02d4189b4c00c504e

2017-06-27 18:55:20 +00:00

..

com/android/settings

Merge "Rename buttons in lock screen setup" into oc-dr1-dev am: fbfca43e6e

2017-06-27 18:55:20 +00:00