OSDN Git Service

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

Change-Id: I4086b464baf1c0a1f84bca6192fa151d4fef301e


Trivial merge