tree a1d0209561241c57aa7678f449b3f7a3a222286b
parent 05cb82caeed3d1b710c74cbba5ac97ee61c1d8ae
parent 909b6db6a327c2102bbcaa56720428319d0d4e94
author Baligh Uddin <baligh@google.com> 1371068269 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371068269 -0700

am 909b6db6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '909b6db6a327c2102bbcaa56720428319d0d4e94':
  Import translations. DO NOT MERGE