OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBill Yi <byi@google.com>
Tue, 7 Jun 2016 02:27:55 +0000 (02:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 Jun 2016 02:27:55 +0000 (02:27 +0000)
am: f3d2c06146  -s ours

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

Change-Id: I45a645fa1affcb646938ae71710634a87008464c


Trivial merge