OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: a2dabae9dd...
authorBill Yi <byi@google.com>
Fri, 14 Oct 2016 09:19:33 +0000 (09:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Oct 2016 09:19:33 +0000 (09:19 +0000)
am: 18593450fc  -s ours

Change-Id: I8f8fa42d04a17027bbb27073ff14a56e78143b41


Trivial merge