OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1741524a82 -s ours
authorBill Yi <byi@google.com>
Fri, 11 Nov 2016 19:17:46 +0000 (19:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Nov 2016 19:17:46 +0000 (19:17 +0000)
am: 6a6db79a4c  -s ours

Change-Id: I3e9d8e78708a11a28be6c177e0785d6a5b1af97a


Trivial merge