OSDN Git Service

Merge "Make failed ConfirmCredential attempts count towards wipe"
authorCharles He <qiurui@google.com>
Thu, 25 May 2017 12:35:42 +0000 (12:35 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 25 May 2017 12:35:43 +0000 (12:35 +0000)
1  2 
res/values/strings.xml

Simple merge