OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Fri, 2 Jun 2017 01:07:55 +0000 (01:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Jun 2017 01:07:55 +0000 (01:07 +0000)
commit8c9c4977370c52fe346b3618ec60198111f5f650
tree0bd7b9978865434fd23262b7b3716211f72064ca
parentf742df0ba1a34afe082fe436cbc57db86d08a3ec
parent9f7e653d563acd3f9cc478fc8a024839ace6c9fa
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 9f7e653d56  -s ours

Change-Id: Iafbfa3a35c305d284ad3a2a2ed06782b80768f7f