summaryrefslogtreecommitdiffstats
path: root/res/values-zh-rCN/strings.xml
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2012-10-10 21:00:47 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-10 21:00:47 -0700
commit159d561ace528192d8b587e2a2d0753dd8e22f1a (patch)
treef5c53f17365993815876c49380672490c3f578a6 /res/values-zh-rCN/strings.xml
parentd64131a83d486283c22d6f7c975a13a3fd0028da (diff)
parent9870efdd359eef447709a92fef474afc04aba24a (diff)
downloadandroid_packages_apps_Trebuchet-159d561ace528192d8b587e2a2d0753dd8e22f1a.tar.gz
android_packages_apps_Trebuchet-159d561ace528192d8b587e2a2d0753dd8e22f1a.tar.bz2
android_packages_apps_Trebuchet-159d561ace528192d8b587e2a2d0753dd8e22f1a.zip
am 9870efdd: (-s ours) am db983fa7: am f8a49f86: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '9870efdd359eef447709a92fef474afc04aba24a': Import translations. DO NOT MERGE
Diffstat (limited to 'res/values-zh-rCN/strings.xml')
0 files changed, 0 insertions, 0 deletions