OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fbfd283125 -s...
authorBill Yi <byi@google.com>
Wed, 26 Jul 2017 23:15:22 +0000 (23:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 23:15:22 +0000 (23:15 +0000)
commitb277fa8fb9f95faee616324b082ff5d89c8ac6c4
tree0a8fc7b85e12a20accc3577d18d2c57bf570a8c0
parent3c1c07a9fe6e37e24accccef2d54459ed678c4f3
parentf66ddc099a76c023545f059f2e9e3e458ea8cb51
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fbfd283125  -s ours" into nyc-mr2-dev am: cd955ca6e5  -s ours
am: f66ddc099a  -s ours

Change-Id: If913cec6881240926b3866eccd4f2680c96bc1f7