tree 84470392f5e182df0a0e8c1a9cb6c733b8504045
parent 6eb8a6c597d419d5a755f6c2ea0750fa7b6ed767
parent eac76dc09edad9d78075cf5dae1d62f671d3f3bf
author Baligh Uddin <baligh@google.com> 1351014314 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351014314 -0700

am eac76dc0: am 21ce854b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'eac76dc09edad9d78075cf5dae1d62f671d3f3bf':
  Import translations. DO NOT MERGE