OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Fri, 5 Aug 2016 18:03:58 +0000 (18:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Aug 2016 18:03:58 +0000 (18:03 +0000)
am: 9353cf10ba  -s ours

Change-Id: I536fcb3b49875f04f45beadf0b252c96ee1ed04c


Trivial merge