OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e231af6c88 -s ours am...
authorBill Yi <byi@google.com>
Thu, 10 Nov 2016 14:51:59 +0000 (14:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 10 Nov 2016 14:51:59 +0000 (14:51 +0000)
commit7045fdd557c89a81b3fd33d63c520a10f1b67a21
treeb26c6baded13e9e9903f672b756b32d4460f4aa4
parentec8cfecb07859dd434b86aa5458a026e2d98ce03
parent35e837a2f5d3ddb299a2a159d3586a737a3f5287
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e231af6c88  -s ours am: 0006905319  -s ours
am: 35e837a2f5  -s ours

Change-Id: I1b90aa4d6ed49964237f93274b5be6e91ddb217f