OSDN Git Service

Merge commit 'a14fc12' into merge_work
authorPrerepa Viswanadham <dham@google.com>
Fri, 10 Apr 2015 22:45:48 +0000 (15:45 -0700)
committerPrerepa Viswanadham <dham@google.com>
Fri, 10 Apr 2015 22:45:48 +0000 (15:45 -0700)
commit1300c49224c39bfba1647f9b5e7d53ef31bd7e20
treeb4ef8ef7a9439c4648d38879d3b79943655f10ae
parenta5f7028ffd58fffd1f7677b4f796e8ddb9996f83
parenta14fc12a90616772510e08ec20a6d2a775a1240f
Merge commit 'a14fc12' into merge_work
res/values/strings.xml