tree aa36775312ff911e727c72064b75ab6b0e2deb38
parent 22583be7671afec5f8cc6761c4e522c45c65d563
parent e8f40508cc1f6d3b19e290dda1375cd41e4a3501
author Baligh Uddin <baligh@google.com> 1351720992 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351720992 -0700

am e8f40508: Import translations. DO NOT MERGE

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