OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Fri, 28 Jul 2017 16:25:14 +0000 (16:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 28 Jul 2017 16:25:14 +0000 (16:25 +0000)
am: 31816f7464  -s ours

Change-Id: I8ed6ff2f40eebe612cf866c66867dc6adfbc0126


Trivial merge