OSDN Git Service

am 572bdaa4: (-s ours) am f0d79e57: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Fri, 14 Feb 2014 20:37:36 +0000 (20:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Feb 2014 20:37:36 +0000 (20:37 +0000)
commitbb69c0d85cdfa60f7b62a35e26c361777aaedb60
treea4715d80eec22ae510bf87338cc72a445c00da5d
parent1b2ee8c1b3a525f02cf2d302744cf4c868985f5c
parent572bdaa47484f38cc46a8507231cfec51b3c2e13
am 572bdaa4: (-s ours) am f0d79e57: (-s ours) Import translations. DO NOT MERGE

* commit '572bdaa47484f38cc46a8507231cfec51b3c2e13':
  Import translations. DO NOT MERGE