OSDN Git Service

am b6dae108: (-s ours) am 76625fec: (-s ours) am 0bdf1aab: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 15:45:40 +0000 (15:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 15:45:40 +0000 (15:45 +0000)
* commit 'b6dae108b33381f4478781136b0dc395fde38136':
  Import translations. DO NOT MERGE


Trivial merge