OSDN Git Service

am 404d21fa: (-s ours) am bcc5b07e: (-s ours) am 7521c1a0: (-s ours) am 82c61b2d...
authorGeoff Mendal <mendal@google.com>
Mon, 5 Oct 2015 12:54:44 +0000 (12:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Oct 2015 12:54:44 +0000 (12:54 +0000)
* commit '404d21fa17f250f3d1df04726a2e6be71d9a3f35':
  Import translations. DO NOT MERGE


Trivial merge