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:38:15 +0000 (16:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Jul 2016 16:38:15 +0000 (16:38 +0000)
am: 7d8fe60299  -s ours

Change-Id: Id36fc37ef69e00b795fee823fd86b1fecb9b6df1


Trivial merge