OSDN Git Service

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

Change-Id: Ie2fb8eaa3d8200f63340cb2103d12ef921eb7903


Trivial merge