tree 3e27791185c513b3e17acaad5109774ef6f670a9
parent e0d3fe304749fd591d84bcc5b1e0efd9b3a5e80e
parent 3822340051647969fb4bdc814782622d1d593adf
author Baligh Uddin <baligh@google.com> 1349726675 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349726675 -0700

am 38223400: (-s ours) am e33f6d36: am e3304327: Import translations. DO NOT MERGE

* commit '3822340051647969fb4bdc814782622d1d593adf':
  Import translations. DO NOT MERGE