OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Mon, 8 Aug 2016 13:55:43 +0000 (13:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 8 Aug 2016 13:55:43 +0000 (13:55 +0000)
am: 96707c53cc  -s ours

Change-Id: I26ce216345d4e820038dabd413a0bbcb787c3a9e


Trivial merge