OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Mon, 8 Aug 2016 13:55:46 +0000 (13:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 8 Aug 2016 13:55:46 +0000 (13:55 +0000)
am: 867f6d5dd5  -s ours

Change-Id: I598c9552fe3c0a044ae336d662de97dcd385ba78


Trivial merge