OSDN Git Service

am 9f3e169c: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 7 Sep 2015 15:38:29 +0000 (15:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 7 Sep 2015 15:38:29 +0000 (15:38 +0000)
* commit '9f3e169c3a6277187fe00abc2eaa08d5872160ef':
  Import translations. DO NOT MERGE


Trivial merge