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

author Maurice Lam <yukl@google.com>

Tue, 27 Jun 2017 01:10:48 +0000 (01:10 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 27 Jun 2017 01:10:49 +0000 (01:10 +0000)
author Maurice Lam <yukl@google.com>
Tue, 27 Jun 2017 01:10:48 +0000 (01:10 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 27 Jun 2017 01:10:49 +0000 (01:10 +0000)
diff --cc src/com/android/settings/password/ChooseLockPassword.java
Simple merge
author	Maurice Lam <yukl@google.com>
	Tue, 27 Jun 2017 01:10:48 +0000 (01:10 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 27 Jun 2017 01:10:49 +0000 (01:10 +0000)