OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f497c48345 -s ours
authorBill Yi <byi@google.com>
Thu, 29 Sep 2016 07:57:41 +0000 (07:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Sep 2016 07:57:41 +0000 (07:57 +0000)
am: c53fb015d9  -s ours

Change-Id: I86a1e1bd6a7ef84d41b743d1ac1b0827183ff94f


Trivial merge