OSDN Git Service

am 1435018e: (-s ours) am b87bbcfb: (-s ours) am bbd70391: (-s ours) am 13cbe053...
authorGeoff Mendal <mendal@google.com>
Sat, 1 Aug 2015 17:03:42 +0000 (17:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 1 Aug 2015 17:03:42 +0000 (17:03 +0000)
* commit '1435018e4b5f3380b62d4bc2ac022cdb2c2746bd':
  Import translations. DO NOT MERGE


Trivial merge