OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Thu, 20 Jul 2017 21:27:48 +0000 (21:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Jul 2017 21:27:48 +0000 (21:27 +0000)
am: acd97be0b8  -s ours

Change-Id: Ib8a1e9a9f4b4ae2d056b5b4bf8e6603aa9212c4d


Trivial merge