OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Wed, 30 Aug 2017 21:14:03 +0000 (21:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 30 Aug 2017 21:14:03 +0000 (21:14 +0000)
commitf6667fb4291207c4826b15a25fa96232390c2da6
tree473b0e48557005da26786c74fc2d6af8e16f2aef
parent781afa3a89dad91bfc1c84893d07a802769661ce
parent249c45391e7d49cc975a6ac0a2f13811c59362d2
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 249c45391e  -s ours

Change-Id: I6181ef920c9baab4fa905b3d8772083e4f0bc650