tree eb6b23cff810970054064862da2d14f98f1320f6
parent 3ff9453732fd9dc3ac4e34f74b41f1ec10db97b3
parent 1cdda6a3753f5d776e026fdf421bab3289111cce
author Baligh Uddin <baligh@google.com> 1351721358 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351721358 -0700

am 1cdda6a3: (-s ours) am 4ea79638: am e8f40508: Import translations. DO NOT MERGE

* commit '1cdda6a3753f5d776e026fdf421bab3289111cce':
  Import translations. DO NOT MERGE