OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: ccd9ff6157 -s ours
authorBill Yi <byi@google.com>
Fri, 12 Aug 2016 10:58:14 +0000 (10:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Aug 2016 10:58:14 +0000 (10:58 +0000)
am: d4d3503d57  -s ours

Change-Id: I328576af4b4f006176a98fe8279e44803bb80432


Trivial merge