OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 76e9bd72f9 -s ours
authorBill Yi <byi@google.com>
Wed, 31 May 2017 18:59:07 +0000 (18:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 31 May 2017 18:59:07 +0000 (18:59 +0000)
commit1dac5d5c21103576747edaa25647e6ee991635cf
tree41c308f6e5c0384239c8b20c7057343936266f2b
parent51333ec21faa88f3d496708219a13ee31eed960f
parentd8d031701bf51b70bdba3090d0992dfef75e83ea
Merge "Import translations. DO NOT MERGE" into oc-dev am: 76e9bd72f9  -s ours
am: d8d031701b  -s ours

Change-Id: Ie1d77e8c529ff7409f7169cdeb6c3d7511cd8a0b