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

Merge commit '6c6595ffbf7ab8a3e503bc73dd7f36621b03b04f'

* commit '6c6595ffbf7ab8a3e503bc73dd7f36621b03b04f':
  Reimport Launcher2 translations.  DO NOT MERGE
tree: e414b2de638450345f61fce7d268733ec788ef50
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE