OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f22cb06b4d -s ours
authorBill Yi <byi@google.com>
Thu, 6 Oct 2016 20:54:05 +0000 (20:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Oct 2016 20:54:05 +0000 (20:54 +0000)
commitaf0c4f4f897a9690d972810d24f070d772f7e587
tree040be63294860ecb04814ab40fe3c2e5f839c0ae
parentea0179942b8fb3794bf776b0298a317741507944
parentd5762192f70bbde324f64400b9c1e907997e5e09
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f22cb06b4d  -s ours
am: d5762192f7  -s ours

Change-Id: I5337def39947c7d9101121e030b8674373f607c4