OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: f750173bf1 -s ours
authorBill Yi <byi@google.com>
Wed, 2 Nov 2016 13:08:32 +0000 (13:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Nov 2016 13:08:32 +0000 (13:08 +0000)
commitc99051554615806d55d2bb06f2c512d465b54b35
tree3831dabc02f4ecd778cf0526d8b57a676c3ce5c8
parent4c58e001a2cbfd97611d274b3e3eb2012f44f9ee
parent015687b0269d0a45ae205359ba71357e35fdb714
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: f750173bf1  -s ours
am: 015687b026  -s ours

Change-Id: Id92fa9ff612c16f45cd20978b53f81adf85ef6f1