tree 8200d156c1da992119b6e757eae28867b070b9f2
parent 7ecf798315d4c54e6435f13e0eaaf5c1a0a089b2
parent a2dc0a70e5c01edf78f8a1980301be697dec94c9
author Baligh Uddin <baligh@google.com> 1368204423 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368204423 -0700

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

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