tree 37438c6a8029d156dfa4e6abd68540d367ddf11e
parent 5b5a36d8965fdb461c61dde27692fb059dd8bdc9
parent f4a615d2e78fa7a5c25689a379b4d2d1257503d5
author Eric Fischer <enf@google.com> 1319663697 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1319663697 +0000

am f4a615d2: (-s ours) am 1ba49956: (-s ours) Import revised translations.  DO NOT MERGE

* commit 'f4a615d2e78fa7a5c25689a379b4d2d1257503d5':
  Import revised translations.  DO NOT MERGE