am b735aa0b: Merge "Fix javadoc which broke build." into gingerbread

* commit 'b735aa0b6fabb72097191923d8787b43fa52531e':
  Fix javadoc which broke build.