OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f...
authorBill Yi <byi@google.com>
Thu, 27 Oct 2016 05:11:20 +0000 (05:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Oct 2016 05:11:20 +0000 (05:11 +0000)
am: d37981be5a  -s ours

Change-Id: I847bb6ba0d87353748f4506502f5d17d0f93d035


Trivial merge