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)
commit0b7dfb03c211d93f74cabb76236ca2a9eda339b1
tree60b03e9d36ba4def3efa228f5246ee05f8c4b0ad
parent2e283ab6341d88a30bbd89d21df8c82d769c3066
parent641c9fc23a54519bd6ea7972a9dd89898a84851b
Merge "Make failed ConfirmCredential attempts count towards wipe"
res/values/strings.xml