tree 10da860fcff71886af91d082e31f0e1917926848
parent e6cf2e0c8a82de9fbfcf386d9009560013f0e4bd
parent 7b31b34898cebc5587ba34a619af8bff2921cc27
author Baligh Uddin <baligh@google.com> 1414566069 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566069 +0000

am 7b31b348: (-s ours) am d68f6f49: (-s ours) am f9f10d03: (-s ours) am 24081d3c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '7b31b34898cebc5587ba34a619af8bff2921cc27':
  Import translations. DO NOT MERGE