tree 1263880e07d83b9b9870de6a932723816b48af7d
parent 811a342183b04268c1eff56a29da1aec3c1d0d83
parent f332cbb2bb2193e14bd5a8566c548a2939674983
author Baligh Uddin <baligh@google.com> 1383695397 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383695397 -0800

am f332cbb2: (-s ours) am 205e569b: (-s ours) Import translations. DO NOT MERGE

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