OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-dev
authorBill Yi <byi@google.com>
Fri, 24 Jun 2016 06:30:26 +0000 (06:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 24 Jun 2016 06:30:26 +0000 (06:30 +0000)
commit1072cc117589d0e6e8e8aaf3f967da00e547d6b9
treef2e979c949434da4a70ad1a9d0389179ef9e6960
parenta6ec072541360efa313beb08fab91f0488fa41ab
parent5bb180388a529a3776af6acbe2aa58c5d0a9eda8
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 5bb180388a  -s ours

Change-Id: I13908cbf3a74b215e12c271642722424470e30c6