OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 21 Jul 2016 04:06:17 +0000 (04:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jul 2016 04:06:17 +0000 (04:06 +0000)
commit63157a3b6e94e0817baab36dee304919aa92feb6
treeb3348af0e2af1937f4ec317971714c153f9836df
parentd6803f7eec511b78cca12c12089c8351c80fb3b1
parentc3264b01ed1b15e75dc74041c76e57d40d9e20da
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: c3264b01ed  -s ours

Change-Id: Ia217a988e8816741bca4a04ba2a27c7e09eaf249