OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-dev
authorBill Yi <byi@google.com>
Thu, 16 Jun 2016 10:26:32 +0000 (10:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Jun 2016 10:26:32 +0000 (10:26 +0000)
am: d58da1be76  -s ours

Change-Id: I8f6a3c344ce19bf7dbdf3882e393627ed8029d46


Trivial merge