OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-dev
authorBaligh Uddin <baligh@google.com>
Wed, 8 Jun 2016 13:11:03 +0000 (13:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Jun 2016 13:11:03 +0000 (13:11 +0000)
am: e573989e05  -s ours

Change-Id: I8d196f18d64ae8231f6bb41ffdffbe949a0d0cbd


Trivial merge