OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Tue, 1 Aug 2017 07:41:04 +0000 (07:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 1 Aug 2017 07:41:04 +0000 (07:41 +0000)
commit18a4f6b083ac894050072ab5a6eb6c90435545ab
tree5512966691387654bd5c5f6e8737685aece61776
parent0da3dce9b4ea3daaca54a3c52005fcdbfebea2ca
parent7eca0300b9c1b6cb8962dd66a71343f091daa298
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 7eca0300b9  -s ours

Change-Id: I28041089f69930af33b4ab93d031a2c2efceb0ab