OSDN Git Service

Merge "Merge commit 'a14fc12' into merge_work"
authorPrerepa Viswanadham <dham@google.com>
Sun, 12 Apr 2015 21:59:37 +0000 (21:59 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sun, 12 Apr 2015 21:59:38 +0000 (21:59 +0000)
1  2 
res/values/strings.xml

Simple merge