tree 18b37453c842f59254edbd4a0f7102e3cb195ab1
parent a3264af717a002d94d20dc51c3ac39eba313b614
parent 31ba35766170cfea65ad3f8324f6dae2cceb7244
author Baligh Uddin <baligh@google.com> 1350537825 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350537825 -0700

am 31ba3576: (-s ours) am 996dcfde: am fd29c453: Import translations. DO NOT MERGE

* commit '31ba35766170cfea65ad3f8324f6dae2cceb7244':
  Import translations. DO NOT MERGE