tree 62c2ce4f1f892cdb1750e703cafc1d51dc94d12e
parent b85eb0588632f569a3fbcb7c8a62551e12f9ee24
parent f2645eaaed802a84eec1314306c191eac309517d
author Baligh Uddin <baligh@google.com> 1352530159 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352530159 -0800

am f2645eaa: (-s ours) am 803b2acb: am 8ef7f717: am 7774041f: Import translations. DO NOT MERGE

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