tree cac2d407075fa4a98a675b4ba2b2bf7143a818b7
parent 0fa90ee7ea06dfa03a5c4593917a28357fa0af4b
parent 048a468b51bc4db791b703a9f31e973ca9fc225d
author Baligh Uddin <baligh@google.com> 1349322789 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349322789 -0700

am 048a468b: am 61ace95b: Import translations. DO NOT MERGE

* commit '048a468b51bc4db791b703a9f31e973ca9fc225d':
  Import translations. DO NOT MERGE