tree 4979c0ff157fb54c362a39f9d86f80bfea726ecd
parent a41921ed7e3cfccc40db3f8d2b1e4059b0715ebd
parent 4a1c70e53be40fd1b2c14eb7c0acc93f6df865bc
author Jeff Hamilton <jham@android.com> 1277322594 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277322594 -0700

am 4a1c70e5: Switch the required host Java environment to 1.6.

Merge commit '4a1c70e53be40fd1b2c14eb7c0acc93f6df865bc' into gingerbread-plus-aosp

* commit '4a1c70e53be40fd1b2c14eb7c0acc93f6df865bc':
  Switch the required host Java environment to 1.6.