OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
authorBill Yi <byi@google.com>
Thu, 12 Jan 2017 17:24:45 +0000 (17:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 Jan 2017 17:24:45 +0000 (17:24 +0000)
am: 2f9af2aa69  -s ours

Change-Id: Ia26f0fd7cf8f1c0937fd5b42fed1c8aee22111e0


Trivial merge