OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 14 Sep 2017 02:00:44 +0000 (02:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Sep 2017 02:00:44 +0000 (02:00 +0000)
commitdba48975874a159c62be615fb22724a36ecc572b
treeefb4b6c128d962caa5069433f2bf7ef63a4db6c0
parent6a097eda6bc59284d8c3469fee0309d8aea005d8
parentf45cbb9a8a449c1239ece1b78778c247d13d399e
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: f45cbb9a8a  -s ours

Change-Id: I02b782480173b5e8b55b42de8598b948410b668c