OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f7a7712d50 -s ours
authorBill Yi <byi@google.com>
Thu, 20 Oct 2016 16:10:05 +0000 (16:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Oct 2016 16:10:05 +0000 (16:10 +0000)
commitcbe06ade4a3c8572d95fddc8c318eccb055fc66a
tree7a5b558f2973172d9a4efe68cef72a502b9dc4ec
parente92a8e80c8efd3d5d0f5a084f7a3733e89778e08
parent4df6ac860ea01a7f43a9f7b6eb647a6cc10b7fac
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f7a7712d50  -s ours
am: 4df6ac860e  -s ours

Change-Id: I8d43798266a46cfe198314e80af52042fe4c1ade