OSDN Git Service

am bb9360e3: (-s ours) am 63069cc9: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 4 Mar 2015 14:14:24 +0000 (14:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Mar 2015 14:14:24 +0000 (14:14 +0000)
* commit 'bb9360e36cea7c2af17992c1b08eedbce707962b':
  Import translations. DO NOT MERGE


Trivial merge