OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Tue, 23 Aug 2016 14:29:01 +0000 (14:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 Aug 2016 14:29:01 +0000 (14:29 +0000)
am: a6ec65edab  -s ours

Change-Id: I65b4042f322910f40767c05eea10dc4aaf171160


Trivial merge