OSDN Git Service

Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 84c67fa304 -s ours
authorBill Yi <byi@google.com>
Tue, 12 Jul 2016 16:43:52 +0000 (16:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Jul 2016 16:43:52 +0000 (16:43 +0000)
am: 4ae2cc3803  -s ours

Change-Id: I6b9e92250f1f101a1813685989b353a95784e176


Trivial merge