tree cfdbb151bdaaa374a9ee0dfe26605ab835b1e6e0
parent dae9aa3f3716e7f370ea0b5681d87a7297201b7f
parent 24a12f67ba534bf158ee85cc998c2afbdfc7948a
author Baligh Uddin <baligh@google.com> 1372793803 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1372793803 -0700

am 24a12f67: am 697184b5: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '24a12f67ba534bf158ee85cc998c2afbdfc7948a':
  Import translations. DO NOT MERGE