tree c57790058f0da12c23063a496dc3b47ff19ca268
parent 15d6e7a45df3b12f9289c2a3aa4f694db02128c3
parent 5e030426a50bde016ba55a3f30c20cbfc19799bc
author Baligh Uddin <baligh@google.com> 1348812498 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348812498 -0700

am 5e030426: (-s ours) Import translations. DO NOT MERGE

* commit '5e030426a50bde016ba55a3f30c20cbfc19799bc':
  Import translations. DO NOT MERGE