am 7b142da3: Fix javadoc for Java 6.

Merge commit '7b142da3ce3849e56134666566df3f04f033c57d' into gingerbread-plus-aosp

* commit '7b142da3ce3849e56134666566df3f04f033c57d':
  Fix javadoc for Java 6.