OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Thu, 20 Jul 2017 21:27:48 +0000 (21:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Jul 2017 21:27:48 +0000 (21:27 +0000)
commit2d50ad831e3fae27f14ee10ad4ab8ae09592d6b0
tree99a95c5b018a80bcc4536b2cc45567f6d3a5921a
parent8ace0324eef59af84fe7ec48596374b8a82a0130
parentacd97be0b87afd3719bac617fb32994425a811bb
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: acd97be0b8  -s ours

Change-Id: I4b9fad43198474d48c7eb5313b52f9c9314ca05f