OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Mon, 19 Sep 2016 18:36:50 +0000 (18:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 19 Sep 2016 18:36:50 +0000 (18:36 +0000)
am: a365d9123c  -s ours

Change-Id: Ie64b56ae99d4363edfbeb2d637d89abd6e356cac


Trivial merge