OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Fri, 5 May 2017 12:08:31 +0000 (12:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 May 2017 12:08:31 +0000 (12:08 +0000)
commit9330470b28bd050b40b5c9083e592778abe68dc6
tree4edd6a22c7e5b24c7ba04b2bfead899a4fb7f60e
parentca445e20af543e0d9162073d0e8c7ebe37990ae1
parent2dcbda8004a9c905427e07f4c0d4b71c02ab02e8
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 2dcbda8004  -s ours

Change-Id: I8b39a0a9c01fff1d44613e98a390d257e3f2f858