OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa56eef3fd -s ours
authorBill Yi <byi@google.com>
Tue, 31 May 2016 17:14:11 +0000 (17:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 31 May 2016 17:14:11 +0000 (17:14 +0000)
commitdb3b1b530765f42632dab224959791b319b9b7b7
treebcaa817753cc666a8d6a0ee9dac8564740528430
parent92f200b09c76ae364c8e1eb9b09a4a012a56a9d8
parentd18592cdbbf689ae458128c9217b404d1111a7ed
Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa56eef3fd  -s ours
am: d18592cdbb  -s ours

* commit 'd18592cdbbf689ae458128c9217b404d1111a7ed':

Change-Id: I04ea249c5e6b6272bceabb6b85c8b7750e19f8a2