OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 8d16bcef26 -s ours
authorBill Yi <byi@google.com>
Tue, 27 Jun 2017 20:23:33 +0000 (20:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Jun 2017 20:23:33 +0000 (20:23 +0000)
commitfd2e22d2ea7fbb7ad6aff388638c46274156c6a8
tree688c2bbf0ca2381b5f5dee26e1cebe1c13047a39
parent2dedb463642fd2050909f979cb22af7109acc40b
parentb07d9720119d6726aa0237cd99ba58316cc262df
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 8d16bcef26  -s ours
am: b07d972011  -s ours

Change-Id: I01af0181ba1ebdcc1101f4a6234c0d29459a50a2