OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Sat, 17 Jun 2017 06:07:14 +0000 (06:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 17 Jun 2017 06:07:14 +0000 (06:07 +0000)
commit92c2ff2307334c3e3407176d479052063615fea5
tree8be7a556c0b1da2880022d32b4701d41787c36cf
parent49347cfb22fb58d2e993bef76d2e03edc97479d7
parentfa8fa0d212b09f9351cc4e54d893530e96e8bb0b
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: fa8fa0d212  -s ours

Change-Id: I44db74c9ae9d6b236ee4f068dac9fdcfd190c3e0