OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 0d424ef9bd -s ours
authorBill Yi <byi@google.com>
Thu, 6 Oct 2016 20:58:50 +0000 (20:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Oct 2016 20:58:50 +0000 (20:58 +0000)
commitc8ef13d120b9b74968a56494244bb4446d0d2b50
tree9c73ac99269fc45a7364e693f8ae8bb171e385c7
parent5fb2b6c1c5f2a10021f4579146be7f942af65b78
parentffae7d82c3837ce7dd68703bede08cfc3cebd9bd
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 0d424ef9bd  -s ours
am: ffae7d82c3  -s ours

Change-Id: Iff1708277ff2827a631228d4c4a286e503543190