OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev
authorBill Yi <byi@google.com>
Sat, 17 Sep 2016 19:53:31 +0000 (19:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 17 Sep 2016 19:53:31 +0000 (19:53 +0000)
am: aef6baae73  -s ours

Change-Id: Iab9e7eccc28ba4c4ee139351a8cbb45b491ff3ef


Trivial merge