OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 197da1f978 -s ours
authorBill Yi <byi@google.com>
Tue, 8 Nov 2016 12:08:40 +0000 (12:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 8 Nov 2016 12:08:40 +0000 (12:08 +0000)
commit01c4a57a8dca6c61b6a79881eec0f59e1135f35f
tree3431076a69902022df1db7553ba6e2ef0ae0aa99
parentffc2bf7f287940d73aabc259b9af9ae5eae4b533
parent550103606216df709e2b0ac7c5931d2fde3c0f96
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 197da1f978  -s ours
am: 5501036062  -s ours

Change-Id: Idd14727a629fbd7eca5a1d81e7c56ad52053b2fb