OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 900d7157c0 -s ours
authorBill Yi <byi@google.com>
Wed, 26 Jul 2017 18:21:35 +0000 (18:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 18:21:35 +0000 (18:21 +0000)
commiteb4cef573b65fb25338f8625f60f413153bc0d72
tree4fb4147ab884e56832ce2bca928eebb0735aea49
parent44a8166dd54c9d64437d340396cc08d6a0664b54
parent0608857af59663c7aad99545fdaf17f44de67925
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 900d7157c0  -s ours
am: 0608857af5  -s ours

Change-Id: I715058dfb29217a07a3a5f250d77626a84a1f0a7