OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
authorBill Yi <byi@google.com>
Thu, 26 Jan 2017 07:16:06 +0000 (07:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Jan 2017 07:16:06 +0000 (07:16 +0000)
am: 36f8170bbc  -s ours

Change-Id: If96f86dd128b899982a82f27a54b3682c86123b0


Trivial merge