OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 4122130005 -s ours
authorBill Yi <byi@google.com>
Fri, 19 Aug 2016 15:42:48 +0000 (15:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Aug 2016 15:42:48 +0000 (15:42 +0000)
am: d1ec21e26a  -s ours

Change-Id: I5c472506d02ff9a808c0c0d0ba7a77910d7bebab


Trivial merge