OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 50f02f9d0a -s ours
authorBill Yi <byi@google.com>
Thu, 27 Oct 2016 05:22:34 +0000 (05:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Oct 2016 05:22:34 +0000 (05:22 +0000)
commit914c5c8f41851b7ae6286b528e89ad0c52e7db81
treeae498a1bc694ffdd25124818e03da0e6ccb4e934
parent18b8111b2bff40724cb2f2b3118e7c8d7a0ec5fe
parent521faf362afcd9100353d45bb470a614dcb42f94
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 50f02f9d0a  -s ours
am: 521faf362a  -s ours

Change-Id: I31e63888d11657f0ead8732e6af22282d66a23b5