tree e7739ae52375eba12c5d4706151692c1e16e9d95
parent 1955e485332e0c0c7ba628a8fee888b55dbb3065
parent 8d1a60d40671e92dd8867b7f51446a75ebf832fc
author Baligh Uddin <baligh@google.com> 1412095745 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412095745 +0000

am 8d1a60d4: (-s ours) am 0b470dd9: (-s ours) am 8ddabcd0: (-s ours) am 0b1acbb5: (-s ours) Import translations. DO NOT MERGE

* commit '8d1a60d40671e92dd8867b7f51446a75ebf832fc':
  Import translations. DO NOT MERGE