OSDN Git Service

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

Change-Id: Ie7d6c6f9bbe4af3ca3709c1557dde5e52eeb91bc


Trivial merge