tree 732be2e45a6af945461eb66ad9b6cccaa3e53a8d
parent 6ad4e499a6f9c0477ef430ba4ca73df533f6cadc
parent d83f33969aa2734000338e01b84957996ef1bb34
author Ed Heyl <edheyl@google.com> 1276295249 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1276295249 -0700

am d83f3396: Revert "Merge "Switch the required host Java environment to 1.6." into kraken"

Merge commit 'd83f33969aa2734000338e01b84957996ef1bb34' into gingerbread

* commit 'd83f33969aa2734000338e01b84957996ef1bb34':
  Revert "Merge "Switch the required host Java environment to 1.6." into kraken"