OSDN Git Service

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

Change-Id: Ica64b4dbd45e67e8ed9bcad575126aaccb2bbf17


Trivial merge