OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Fri, 12 Aug 2016 09:32:00 +0000 (09:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Aug 2016 09:32:00 +0000 (09:32 +0000)
commita4fc5f2b760facc5a01ed32225810d018670f99a
treea0056c94189714112f323a7d8e53ce6d52ae2d02
parent505a717a4bf80a58ef95c5d75d3fb0613e1e5aa8
parentd97f0493154f96a60667bd1e0db8545a5edd3329
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: d97f049315  -s ours

Change-Id: I33e2836cf2560848cbb35d25df34757672960ac1