OSDN Git Service

am 13edc160: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 23 Jul 2015 18:59:40 +0000 (18:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Jul 2015 18:59:40 +0000 (18:59 +0000)
* commit '13edc1609ed634130720142045d47315a39ea037':
  Import translations. DO NOT MERGE


Trivial merge