OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
authorBill Yi <byi@google.com>
Wed, 26 Jul 2017 22:52:44 +0000 (22:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 22:52:44 +0000 (22:52 +0000)
commit995029b52919376c4b75f15ad7d6cf2b73d35596
treef12ad3c7b58575844c792386a636283a1a0a476f
parentaec51f497cc2c6e260dea3266038a5ce0360740b
parent3875d1a103b98dbbfef9bf02e44d1903f04009a4
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 3875d1a103  -s ours

Change-Id: Ife54f4e800fd4b81c5639984937096945f063d1d