OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 4 Aug 2016 09:41:10 +0000 (09:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 4 Aug 2016 09:41:10 +0000 (09:41 +0000)
am: dfe576b3e4  -s ours

Change-Id: If528ff620a5250c512f182108bc02b8b4088bf7b


Trivial merge