OSDN Git Service

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

Change-Id: I1e65c727225c0c7ff2dfa6b6c5a70b8b94290eee


Trivial merge