OSDN Git Service

am 9eeae334: (-s ours) am b1dfd97f: (-s ours) am 3b88e96a: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 17:26:05 +0000 (17:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 17:26:05 +0000 (17:26 +0000)
* commit '9eeae3346f92865d724ae3ea8b41c6ac63eb462c':
  Import translations. DO NOT MERGE


Trivial merge