aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/values-ja
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2010-09-13 11:51:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-13 11:51:24 -0700
commitf06a1bb2947221109dac20bdbb93387ad34d347c (patch)
tree6af8aa485bade210d2b69364c4ee57bc7d79d7f7 /java/res/values-ja
parent58e641c3fc8c13b6c88c806c5e47d9cf16311dd7 (diff)
parent0ca8cf67a36b600d05156c9e8e9a80a4403cbe7d (diff)
downloadlatinime-f06a1bb2947221109dac20bdbb93387ad34d347c.tar.gz
latinime-f06a1bb2947221109dac20bdbb93387ad34d347c.tar.xz
latinime-f06a1bb2947221109dac20bdbb93387ad34d347c.zip
am 0ca8cf67: Merge "Rename altchars.xml to keep translation imports from altering it." into gingerbread
Merge commit '0ca8cf67a36b600d05156c9e8e9a80a4403cbe7d' into gingerbread-plus-aosp * commit '0ca8cf67a36b600d05156c9e8e9a80a4403cbe7d': Rename altchars.xml to keep translation imports from altering it.
Diffstat (limited to 'java/res/values-ja')
-rw-r--r--java/res/values-ja/donottranslate-altchars.xml (renamed from java/res/values-ja/altchars.xml)0
1 files changed, 0 insertions, 0 deletions
diff --git a/java/res/values-ja/altchars.xml b/java/res/values-ja/donottranslate-altchars.xml
index d3beafade..d3beafade 100644
--- a/java/res/values-ja/altchars.xml
+++ b/java/res/values-ja/donottranslate-altchars.xml