OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: e371dcf55a -s ours
authorBill Yi <byi@google.com>
Fri, 7 Jul 2017 17:05:29 +0000 (17:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Jul 2017 17:05:29 +0000 (17:05 +0000)
am: dc333a317e  -s ours

Change-Id: If837e09f2811d3114cfbbc72bc9be619593b3f31


Trivial merge