OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 4316b8a -s ours am: d8646...
authorBill Yi <byi@google.com>
Mon, 25 Apr 2016 15:27:06 +0000 (15:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 15:27:06 +0000 (15:27 +0000)
am: 984e0fc  -s ours

* commit '984e0fc8542f7825f942e5913a1e995e18712f82':
  Import translations. DO NOT MERGE

Change-Id: I8177bd8bfb54d25960b691cf03f29999319485bb


Trivial merge