OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Tue, 16 May 2017 18:56:37 +0000 (18:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 May 2017 18:56:37 +0000 (18:56 +0000)
commit95da3ca1424074490b71f7ef88c58efcfb80d112
treeb1d1a0d66685ab728f3db65d4d722c8ec52211f2
parent6789093ca7785a1c55662d0d2420669087a0b983
parent4dc5766846464bad0299d52c083880dec1f4f1b5
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 4dc5766846  -s ours

Change-Id: I078ec6f2ba23670a233f069c578a9a65c2e21c23