tree cc106cf772232e5cdbe5fa58711532b62b3fd571
parent d88079f30b2cf947ddaaeec669973e0c61072abd
parent 7940a364e0d59f67e40ce1738868700ef41ea571
author Baligh Uddin <baligh@google.com> 1408985110 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408985110 +0000

am 7940a364: (-s ours) am c78c4524: (-s ours) Import translations. DO NOT MERGE

* commit '7940a364e0d59f67e40ce1738868700ef41ea571':
  Import translations. DO NOT MERGE