OSDN Git Service

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

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

Change-Id: Ie6bc9da984bc94b51d091bf3a3b4c035ff83aba6