OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 6654edae49 -s ours
authorBill Yi <byi@google.com>
Tue, 7 Feb 2017 14:20:39 +0000 (14:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 Feb 2017 14:20:39 +0000 (14:20 +0000)
commit63bfc8312cb157726b5cdb6931f026753d6e10c6
treed293cb16bd1a4fec54d928c084531b8fae53bc6c
parentb01f312dd08a91006364d1fe3c659619e3669e2b
parent5e1652a7c9e385104da3451073869d52d0e5dfbc
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 6654edae49  -s ours
am: 5e1652a7c9  -s ours

Change-Id: I12564fcecc14484b8cf32c669f77bf5f11c0fa87