tree a7f60f980475bd65299f8a796fe0315cf25746d8
parent 5d79d10734b45133be7753955afd9e5edec58a1d
parent 429f8a2d506df3c8260fbb8cb800cfdb7a79e2a2
author Baligh Uddin <baligh@google.com> 1442598357 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442598357 +0000

am 429f8a2d: (-s ours) am 0f3d460e: (-s ours) am 6ddeb1d3: (-s ours) am 51fc9bdd: (-s ours) Import translations. DO NOT MERGE

* commit '429f8a2d506df3c8260fbb8cb800cfdb7a79e2a2':
  Import translations. DO NOT MERGE