OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-dev
authorBill Yi <byi@google.com>
Thu, 30 Jun 2016 03:23:51 +0000 (03:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Jun 2016 03:23:51 +0000 (03:23 +0000)
commit847dcc9f4e54d9e34963a228e6ea7371028aded3
treeb346b5bf62af5cd9aaa79e6ae9cf17d159293b16
parentc4376b5fae2092bc4da4259710fb08a909260fe0
parentbb07b0b3720250b693fb2abe70325e93bdf7ffbd
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: bb07b0b372  -s ours

Change-Id: I3b4ad7bc8c424e58daddb1d5f16d338f35636eb6