am 5b68c655: Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1

* commit '5b68c655a1f56dce1ffd6f175e991dd542d415cf':
  docs: update makefile to show javadocs diffs for api level 12