OSDN Git Service

am a9f19dea: am 01dc50f5: am ff702a29: Merge "Added setting strings for new fingerpri...
authorSelim Cinek <cinek@google.com>
Thu, 11 Jun 2015 05:56:19 +0000 (05:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Jun 2015 05:56:19 +0000 (05:56 +0000)
* commit 'a9f19dea4472a76d7c6ec280ff1a0da6a7e64c0e':
  Added setting strings for new fingerprint introduction screen

1  2 
res/values/strings.xml

Simple merge