OSDN Git Service

Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: b9aa9b47e7 -s ours...
authorBaligh Uddin <baligh@google.com>
Thu, 23 Jun 2016 00:53:11 +0000 (00:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 23 Jun 2016 00:53:11 +0000 (00:53 +0000)
am: c33f3fd0e4  -s ours

Change-Id: Ic50a2a219031b38bd7263598b5e442e40148492f


Trivial merge