OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Mon, 2 Oct 2017 17:45:18 +0000 (17:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 Oct 2017 17:45:18 +0000 (17:45 +0000)
commit899f5cf30984a3b185fd85a14793039fe3055853
treedde629699256a2a0410bcdd73f47d87c8f9ffed2
parent595adddf1c96ad414a3edc8387bd53f64c606e5d
parent995627c3ee75dce1ebf6338012cba60d68fe94f0
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 995627c3ee  -s ours

Change-Id: I1acc544f6cab8fdde4d7b66b110baf46114a3730