OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Fri, 22 Jul 2016 01:42:42 +0000 (01:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Jul 2016 01:42:42 +0000 (01:42 +0000)
commit7e2d2531069d310dfbebf723475795296a63b124
tree442351a3b3d3e38ee1cd094c5814c57d02058bbe
parentcd2e8c4cda35f397815107405aa568fca241dcc8
parent2ece9e489427ffe190ee7d23b5fc8214cf6a516f
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 2ece9e4894  -s ours

Change-Id: Ie5649d4576ae56c27a75b8fcca8c10124feab9db