OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
authorBill Yi <byi@google.com>
Fri, 20 Oct 2017 15:35:36 +0000 (15:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 15:35:36 +0000 (15:35 +0000)
commit770e4008b211d030536b314da2df2c0cfeefa995
treeb4d58817d9c4e995fe978578889d563149ba3b9a
parentb84582fc9647ba0fe4a2d3b406d40cd1d394ae19
parentc035f281753c7ac8892ce35d7b36db0f7b412dc6
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: c035f28175  -s ours

Change-Id: Id153ec0566031b928d5087c04b03616141ab0568