OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 21 Jul 2016 03:39:55 +0000 (03:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jul 2016 03:39:55 +0000 (03:39 +0000)
commitdb8b36970cb479a05ec5072d03dee9de89841294
treeb3348af0e2af1937f4ec317971714c153f9836df
parentdab3b245e0f84d6b13e0a228a2b8d9050af502ae
parent60858a45cdf88407925ec59c3af56bfd92d70344
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 60858a45cd  -s ours

Change-Id: I2b913190f77c1351e1b776f2bb319d550af309e3