OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f -s ours
authorBill Yi <byi@google.com>
Thu, 27 Oct 2016 04:59:49 +0000 (04:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Oct 2016 04:59:49 +0000 (04:59 +0000)
am: b9cc1f603c  -s ours

Change-Id: I76607e7e8ecbdf03db23955402a626d89f144e31


Trivial merge