OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Fri, 7 Jul 2017 15:54:31 +0000 (15:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Jul 2017 15:54:31 +0000 (15:54 +0000)
am: 33393ffa7d  -s ours

Change-Id: If4cd6d9504c519c186e1f3a1913ed91e81a3ae6b


Trivial merge