OSDN Git Service

am 39a58e87: (-s ours) am 408606f3: (-s ours) am 78a247da: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 15:45:29 +0000 (15:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 15:45:29 +0000 (15:45 +0000)
* commit '39a58e878c58579ab22b855a50d33398dbf5a7ff':
  Import translations. DO NOT MERGE


Trivial merge