tree cecf732288834cf4cae7f544c05ea15783a4ac85
parent 805e2bfefba9d8819244fe0783f70c218fb0fe2d
parent bc3fbe89f1c7f2b8f370e5043a033a82a2e5ac9d
author Baligh Uddin <baligh@google.com> 1386787814 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386787814 -0800

am 99425be2: (-s ours) Import translations. DO NOT MERGE

* commit '99425be2503b0ffc43f0f89ed591e353dbfecd20':
  Import translations. DO NOT MERGE