OSDN Git Service

Merge "Show current screen lock as summary"
authorJason Monk <jmonk@google.com>
Fri, 3 Apr 2015 14:56:52 +0000 (14:56 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 3 Apr 2015 14:56:53 +0000 (14:56 +0000)
1  2 
res/values/strings.xml
src/com/android/settings/ChooseLockGeneric.java

Simple merge