OSDN Git Service

am 3f10b42f: (-s ours) am 684332f2: (-s ours) am 5449f0fd: (-s ours) am 62f7a266...
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 14:47:31 +0000 (14:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 14:47:31 +0000 (14:47 +0000)
* commit '3f10b42f7d1e554cb98696201dd1335b9cd24fb4':
  Import translations. DO NOT MERGE


Trivial merge