tree e414b2de638450345f61fce7d268733ec788ef50
parent df16a419a1a89e1ba4e33057969cd739e1d21c9d
parent 6c6595ffbf7ab8a3e503bc73dd7f36621b03b04f
author Eric Fischer <enf@google.com> 1266543263 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1266543263 -0800

am 6c6595ff: (-s ours) am 5d12096c: Reimport Launcher2 translations.  DO NOT MERGE

Merge commit '6c6595ffbf7ab8a3e503bc73dd7f36621b03b04f'

* commit '6c6595ffbf7ab8a3e503bc73dd7f36621b03b04f':
  Reimport Launcher2 translations.  DO NOT MERGE