OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Wed, 30 Aug 2017 21:19:16 +0000 (21:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 30 Aug 2017 21:19:16 +0000 (21:19 +0000)
commitdd3cefb4ef6d4fee0b0c1fd2b20df2956183a178
tree473b0e48557005da26786c74fc2d6af8e16f2aef
parentf6667fb4291207c4826b15a25fa96232390c2da6
parentb997ba11319cd2874c8c8f4abcdd76c24d0ca9c1
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: b997ba1131  -s ours

Change-Id: I372f1f65bc2d9918eb6d04c74d0c792516be484c