OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 51e35963ae ...
authorBill Yi <byi@google.com>
Sat, 22 Jul 2017 17:16:59 +0000 (17:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 17:16:59 +0000 (17:16 +0000)
am: e3f6e69af1  -s ours

Change-Id: Ib0bc3bdae13c6af93d0841744c60a49c8152f255


Trivial merge