OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 30 Jun 2016 03:18:22 +0000 (03:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Jun 2016 03:18:22 +0000 (03:18 +0000)
commit5abcce865e1e5fe183cab6533532e8674d9d3b12
treee0f5bab73f038bc3d67b30457d694d1dba3168d2
parentcb489988837906c34b3b53aa1917ae2c0b7654e9
parent8c9d0dbeda47394b34d3cdf6ae9780e0ac3f87f0
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 8c9d0dbeda  -s ours

Change-Id: Ib329b5874cd43a8079f7c0cda2777f5636a89b8b