OSDN Git Service

Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: a2e1bb8c3e -s ours
authorBill Yi <byi@google.com>
Tue, 12 Jul 2016 16:44:00 +0000 (16:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Jul 2016 16:44:00 +0000 (16:44 +0000)
am: 8d06bbf201  -s ours

Change-Id: I36cfe7b2c938cf8bb8d22fc65c9d25e04197d61d


Trivial merge