OSDN Git Service

Merge "Don't index the ChooseLockGeneric screen" into lmp-dev
authorAmith Yamasani <yamasani@google.com>
Sat, 23 Aug 2014 01:07:02 +0000 (01:07 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 23 Aug 2014 01:07:03 +0000 (01:07 +0000)
1  2 
res/values/strings.xml

Simple merge