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

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