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

am 0fa90ee7: (-s ours) am 3cb9fb1c: Import translations. DO NOT MERGE

* commit '0fa90ee7ea06dfa03a5c4593917a28357fa0af4b':
  Import translations. DO NOT MERGE