OSDN Git Service

am 8bcfdb70: (-s ours) am 82df9b72: (-s ours) am eb6babec: (-s ours) Import translati...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 18:17:37 +0000 (18:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 18:17:37 +0000 (18:17 +0000)
* commit '8bcfdb707fb4ac8c44ec1f2c7483e35d5854e295':
  Import translations. DO NOT MERGE


Trivial merge