OSDN Git Service

am 2061f4e2: (-s ours) am cfad6fc1: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 26 Feb 2015 23:25:47 +0000 (23:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 26 Feb 2015 23:25:47 +0000 (23:25 +0000)
* commit '2061f4e296a94093920c772cfeb12c03eac98ac6':
  Import translations. DO NOT MERGE


Trivial merge