OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: d84995e18f -s ours...
authorBill Yi <byi@google.com>
Thu, 1 Sep 2016 07:07:04 +0000 (07:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 1 Sep 2016 07:07:04 +0000 (07:07 +0000)
am: bd811838f7  -s ours

Change-Id: Iffcf95ab7e3f336662aa2f7f2399b1917fce56be


Trivial merge