OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBill Yi <byi@google.com>
Tue, 31 May 2016 16:36:46 +0000 (16:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 31 May 2016 16:36:46 +0000 (16:36 +0000)
am: aa56eef3fd  -s ours

* commit 'aa56eef3fd67e8eb20df96850e0175fb15b3f415':
  Import translations. DO NOT MERGE

Change-Id: I8d141f7bb06750c09b60084105ec51f6aeb244ad


Trivial merge