OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: d97f049315 -s ours
authorBill Yi <byi@google.com>
Fri, 12 Aug 2016 09:39:46 +0000 (09:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Aug 2016 09:39:46 +0000 (09:39 +0000)
commit5798a13b5ee7c735d5e35e498bcf3803db3352bc
tree4636300d89a3901ef80da8b87db3d2c28626f270
parenta4314f27bc2b8f42b6e55a2cc0bd788dc1162466
parenta4fc5f2b760facc5a01ed32225810d018670f99a
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: d97f049315  -s ours
am: a4fc5f2b76  -s ours

Change-Id: I32213fc43c9f653b35ee856d72284158a5ae8d1a