OSDN Git Service

am b9a1a93e: (-s ours) am 788248b1: (-s ours) am 3f10b42f: (-s ours) am 684332f2...
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 15:16:30 +0000 (15:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 15:16:30 +0000 (15:16 +0000)
* commit 'b9a1a93e7e6f68590cd459ee8f0379aaf497f528':
  Import translations. DO NOT MERGE


Trivial merge