OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Mon, 31 Jul 2017 06:06:17 +0000 (06:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 31 Jul 2017 06:06:17 +0000 (06:06 +0000)
am: 273bb516ad  -s ours

Change-Id: I5b0b3e17d14a5d86a2b7296f385e947f30cd3332


Trivial merge