OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: ef2989920d -s ours
authorBill Yi <byi@google.com>
Fri, 3 Jun 2016 17:13:04 +0000 (17:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Jun 2016 17:13:04 +0000 (17:13 +0000)
commit2e03e4651ac37564da484ae44e52be7b16aa0e96
tree8d7e5311c0b596c5abecd47fa8c19d9f757cfdb1
parent650a2aad33720c0270593003c2e4078ba6d49feb
parentf089201e2e574f6a3bce81253b385d6f67d20532
Merge "Import translations. DO NOT MERGE" into nyc-dev am: ef2989920d  -s ours
am: f089201e2e  -s ours

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

Change-Id: I5b1436cfb9cb51a6be47e6e7c52556727f8811e5