OSDN Git Service

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

Change-Id: Icba6165b4f29f4945b17b9dc694ddff877054555


Trivial merge