OSDN Git Service

am 4e3af2ec: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 24 Aug 2015 16:29:56 +0000 (16:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Aug 2015 16:29:56 +0000 (16:29 +0000)
* commit '4e3af2ec5a480754e5d0793ce21b68cb3a9b32d8':
  Import translations. DO NOT MERGE


Trivial merge