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:47:05 +0000 (15:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Aug 2016 15:47:05 +0000 (15:47 +0000)
am: c9731879e5  -s ours

Change-Id: I1a8639300f517c0c26c411221532d26f406c99c7


Trivial merge