tree 10da860fcff71886af91d082e31f0e1917926848
parent 2640f0499b1871d6564d44418eb4038e90b1ffd7
parent 33951d6383d943b47166980b58691589ebd38da0
author Baligh Uddin <baligh@google.com> 1414566451 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566451 +0000

am 33951d63: (-s ours) am c7cdc43e: (-s ours) am 72af7f8d: (-s ours) am 72b4c7c3: (-s ours) am 3e6b26da: (-s ours) am cff2d6a2: (-s ours) Import translations. DO NOT MERGE

* commit '33951d6383d943b47166980b58691589ebd38da0':