OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa97eb008e -s ours
authorBill Yi <byi@google.com>
Fri, 5 Aug 2016 18:29:00 +0000 (18:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Aug 2016 18:29:00 +0000 (18:29 +0000)
am: 83a6b9dc61  -s ours

Change-Id: I8110c325b71990a956c485d1074c073137c3611e


Trivial merge