tree 412d42fdb58b979f6db19f875f24f6913c4b278e
parent 9ad7b946fe9a5dd706205e90046ddc1bd6cb8ad0
parent 697184b56f918799440bf7749ea8c1e636a63725
author Baligh Uddin <baligh@google.com> 1372793472 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1372793472 -0700

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

* commit '697184b56f918799440bf7749ea8c1e636a63725':
  Import translations. DO NOT MERGE