OSDN Git Service

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

Change-Id: I37cd6967159c29d209e1f97a750d9d8508fcd466


Trivial merge