OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Tue, 11 Jul 2017 04:11:37 +0000 (04:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Jul 2017 04:11:37 +0000 (04:11 +0000)
commit219086822c56a0f0ef86dfe0be7abac2d721164d
treed027b8e5860b412dfcd8b5b9d3316fff7f54a749
parent4a11531ec773bfb06b66d7b7fc8a44d6a66255b3
parent75bcd075f23794e0ef17ed3b8e25d3b449b61c23
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 75bcd075f2  -s ours

Change-Id: Ic3bdba9d8575e66c4e94229380e3225881244013