OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7efa4cc6de -s ours
authorBaligh Uddin <baligh@google.com>
Tue, 10 May 2016 18:15:52 +0000 (18:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 May 2016 18:15:52 +0000 (18:15 +0000)
am: 994fbea737  -s ours

* commit '994fbea737718ccc47b83467a1e75027ff327228':
  Import translations. DO NOT MERGE

Change-Id: Iab066dbe7473df8047edec1eac2440483cbf4035


Trivial merge