OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 21 Jul 2016 03:42:29 +0000 (03:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jul 2016 03:42:29 +0000 (03:42 +0000)
commitf536f4989dc5654ab4fc13adde0dab6d99dcb144
treeb3348af0e2af1937f4ec317971714c153f9836df
parentffbdc55a1d065a0e08c719031e8b89f1d07f2f36
parent50fd9a9ca49f6942832fba597ac5def3fed536ce
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 50fd9a9ca4  -s ours

Change-Id: I92bcafd93bb2c1fe1818415b2f991fd677101dea