OSDN Git Service

Merge "Change decryption strings" into lmp-dev
authorPaul Lawrence <paullawrence@google.com>
Tue, 19 Aug 2014 20:49:52 +0000 (20:49 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 16 Aug 2014 04:03:42 +0000 (04:03 +0000)
1  2 
res/values/strings.xml

Simple merge