OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBaligh Uddin <baligh@google.com>
Tue, 3 May 2016 16:54:25 +0000 (16:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 3 May 2016 16:54:25 +0000 (16:54 +0000)
am: ad4773b774  -s ours

* commit 'ad4773b774d905bfcccc3d1dbb45d0f0c27bc12e':
  Import translations. DO NOT MERGE

Change-Id: Ia1afdb49580d23fbe60f22f458d169c62bea1e3b


Trivial merge