tree bbf5eff47faa8430519da1897a09e0bf563d7bfe
parent c7bc41e252ae0d95917a31500459959b5a0929f2
parent 14562754ea68a333d81e189ca7aa31c95e4b5129
author Baligh Uddin <baligh@google.com> 1367335902 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367335902 -0700

am 14562754: (-s ours) am 81426b9b: Import translations. DO NOT MERGE

* commit '14562754ea68a333d81e189ca7aa31c95e4b5129':
  Import translations. DO NOT MERGE