OSDN Git Service

am c34f7fc7: (-s ours) am 40a54fd8: (-s ours) am c064ecdf: (-s ours) am 3ca58bbd...
authorGeoff Mendal <mendal@google.com>
Sat, 8 Aug 2015 14:59:39 +0000 (14:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 8 Aug 2015 14:59:39 +0000 (14:59 +0000)
* commit 'c34f7fc7724ef71df4f3eb2d2888c534ae09f06f':
  Import translations. DO NOT MERGE


Trivial merge