OSDN Git Service

Merge "Default setup wizard to use PIN"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 18 May 2017 08:43:19 +0000 (08:43 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 18 May 2017 08:43:24 +0000 (08:43 +0000)
1  2 
res/values/strings.xml
src/com/android/settings/password/ChooseLockGeneric.java

Simple merge