tree bf06e2527da516dd19289df3437017aa596d9ce4
parent dc0767d3460b2be8526d955ab3b3b0ffee927e42
parent 51fc9bddf33616aa8abaf4a37889efa90679e445
author Baligh Uddin <baligh@google.com> 1442596593 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442596593 +0000

am 51fc9bdd: (-s ours) Import translations. DO NOT MERGE

* commit '51fc9bddf33616aa8abaf4a37889efa90679e445':
  Import translations. DO NOT MERGE