tree 6b645b5f29d9e06b15a0fa4cbd1d6d5a1e2b17ff
parent 94a2e9f9573a0526dba637e38670c526d824f139
parent ee8b4b4c85f4cf080ca26eaed95bfb0da4e40fd6
author Baligh Uddin <baligh@google.com> 1381531971 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381531971 -0700

am e7686bf0: (-s ours) am 82582436: (-s ours) Import translations. DO NOT MERGE

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