OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Sat, 17 Jun 2017 06:18:54 +0000 (06:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 17 Jun 2017 06:18:54 +0000 (06:18 +0000)
commitbabf652e62643fdc03f7b0a05ed9139f7a0cfb75
treeeda0576faf9642cc05be8e09575b7fec0c3f1ec7
parent74facaef64d8fbdf8672d86b5471ff226050a48e
parent767d02158eaf55d9d77d65c3d935efc26823bb85
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 767d02158e  -s ours

Change-Id: I596636ce8d71ce60bb73ef4c95d1df32c0b1d3a0