OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 20 Oct 2016 16:02:34 +0000 (16:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Oct 2016 16:02:34 +0000 (16:02 +0000)
commit4df6ac860ea01a7f43a9f7b6eb647a6cc10b7fac
tree8fa0ade7db7a04c3b9aaf8b695ee43fd1efb74b6
parenta3e34d43845ff160ae949b6f50f9fbc22b724802
parentf7a7712d50b41fb4209e1808c7eaa8824c02a031
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: f7a7712d50  -s ours

Change-Id: I2c73b3824bd0fdcb3628e71c641b811202d26d2a