OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
authorBill Yi <byi@google.com>
Sat, 5 Nov 2016 06:32:51 +0000 (06:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 5 Nov 2016 06:32:51 +0000 (06:32 +0000)
am: b14995516a  -s ours

Change-Id: Ibfd1760a251c164b392fb64640fc0c39e4ac0556


Trivial merge