am 0eb2d838: am 5fbaefc3: Merge change I4db3a5b3 into eclair

Merge commit '0eb2d8383323dd4567cd668a6d4e77d8556a34b4' into eclair-mr2-plus-aosp

* commit '0eb2d8383323dd4567cd668a6d4e77d8556a34b4':
  fix a javadoc build breakage