OSDN Git Service

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

Change-Id: Ib1ddc2a0926bea50e29b4e3ef7cb098a5e94823e


Trivial merge