OSDN Git Service

am 0bb8ba32: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 2 Feb 2015 15:30:26 +0000 (15:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 2 Feb 2015 15:30:26 +0000 (15:30 +0000)
commitc202347d6ec25a525ac51707461b903d7061270d
tree6f3ef61b88b9fe16ff7692642ce1f7f9fe7a1d55
parent70dbf05d50f29685f0754a35c96fe2b041b5ac2f
parent0bb8ba322e0bed9d988e14888079c5d6283cfacc
am 0bb8ba32: (-s ours) Import translations. DO NOT MERGE

* commit '0bb8ba322e0bed9d988e14888079c5d6283cfacc':
  Import translations. DO NOT MERGE