am 3ae2a715: am 9f928944: Merge "update droiddoc option to include api level...
am 3ae2a715: am 9f928944: Merge "update droiddoc option to include api level 21 for javadoc tagging" into lmp-dev
* commit '3ae2a715':
update droiddoc option to include api level 21 for javadoc tagging