OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: d9c8da1283 -s ours
authorBill Yi <byi@google.com>
Fri, 11 Nov 2016 19:24:52 +0000 (19:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Nov 2016 19:24:52 +0000 (19:24 +0000)
am: f2790ac31d  -s ours

Change-Id: I7ed9d9242eaa1ceed6a939315151c0b708f5cf0b


Trivial merge