OSDN Git Service

Merge "Fix encryption strings" into lmp-dev
authorPaul Lawrence <paullawrence@google.com>
Tue, 19 Aug 2014 20:50:14 +0000 (20:50 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 16 Aug 2014 03:51:48 +0000 (03:51 +0000)
1  2 
res/values/strings.xml

Simple merge