tree 354da64b51fa9185e68f751ae699be603a43516f
parent 50a8911628a27fbbac678dd679aaafadceb65bee
parent bd7ff05e65113cd6fa5b7e0df9c7023e8cd60ac0
author Baligh Uddin <baligh@google.com> 1353117013 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1353117013 -0800

am bd7ff05e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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