OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 21 Jul 2016 03:42:33 +0000 (03:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jul 2016 03:42:33 +0000 (03:42 +0000)
commitd6803f7eec511b78cca12c12089c8351c80fb3b1
treeb3348af0e2af1937f4ec317971714c153f9836df
parentf536f4989dc5654ab4fc13adde0dab6d99dcb144
parent28cb16305649ff3abfedb0000d4b82eef12eee91
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 28cb163056  -s ours

Change-Id: I909f8334846a92370d136722d1aa8eaa1aa162ca