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

* commit 'fc696fb6f3eb1b8226ac4675da02e512e5ff48bd':
  update droiddoc option to include api level 21 for javadoc tagging
This commit is contained in:
smain@google.com
2014-10-09 19:22:48 +00:00
committed by Android Git Automerger

View File

@@ -631,6 +631,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \
-since $(SRC_API_DIR)/18.txt 18 \
-since $(SRC_API_DIR)/19.txt 19 \
-since $(SRC_API_DIR)/20.txt 20 \
-since $(SRC_API_DIR)/21.txt 21 \
-werror -hide 111 -hide 113 \
-overview $(LOCAL_PATH)/core/java/overview.html