OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Sat, 10 Jun 2017 06:13:36 +0000 (06:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 10 Jun 2017 06:13:36 +0000 (06:13 +0000)
am: 7c8b1e6832  -s ours

Change-Id: I8f92d3f9c8b15070a661cf0480268b7100ca33ec


Trivial merge