am 6ad4e499: am 1f29d2c3: Merge "Switch the required host Java environment to 1.6." into kraken

Merge commit '6ad4e499a6f9c0477ef430ba4ca73df533f6cadc' into gingerbread-plus-aosp

* commit '6ad4e499a6f9c0477ef430ba4ca73df533f6cadc':
  Switch the required host Java environment to 1.6.