tree 5287d3e5505ecfa46813c2413a01d02b1f9452e0
parent 0da628e2bf069cd474e546a9cc2b116eb8016326
parent 1d9261df10e296888f5b55ed984e6ebb6c28cb62
author Baligh Uddin <baligh@google.com> 1409047628 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409047628 +0000

am 1d9261df: (-s ours) am 41898f44: (-s ours) am 3ff6d06b: (-s ours) am 47358b6a: (-s ours) am 2637bc51: (-s ours) Import translations. DO NOT MERGE

* commit '1d9261df10e296888f5b55ed984e6ebb6c28cb62':
  Import translations. DO NOT MERGE