OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 21 Jul 2016 03:42:25 +0000 (03:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jul 2016 03:42:25 +0000 (03:42 +0000)
commitffbdc55a1d065a0e08c719031e8b89f1d07f2f36
treeb3348af0e2af1937f4ec317971714c153f9836df
parent74d10c0b14507b23e0419d827a2ba96f348e5d88
parent3638c9b330bf295c63e4d1377b092e973535f278
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 3638c9b330  -s ours

Change-Id: Ice6116e80bcca10df08e8d6b178911f0b266e922