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