tree 852c6c9d0c95b5420cb5aaec1809abeb8ccdd9a0
parent 553f4c7676c9586754d44a61389f15420bc08db9
parent de7f96efba7d615bc1cbb1f96ef348f41cd8a60c
author Baligh Uddin <baligh@google.com> 1352994909 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352994909 -0800

am de7f96ef: am 6ca495de: Import translations. DO NOT MERGE

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