OSDN Git Service

Merge "[Fingerprint] Change message in encryption" into mnc-dev
authorMaurice Lam <yukl@google.com>
Tue, 21 Jul 2015 00:22:34 +0000 (00:22 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 21 Jul 2015 00:25:16 +0000 (00:25 +0000)
1  2 
res/values/strings.xml

Simple merge