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:09:07 +0000 (23:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 23:09:07 +0000 (23:09 +0000)
commit45f115afadcf0272fbe78c3c6263042d8747dd46
treec1e960668ec9fa035561a8f4791f8c3b7491dd84
parent5d74b7d67626a96d092005d06a932b1160269ecc
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: Ia6630c6dd3cf9daf78fd3f07ebdc7515c548a3bd