resolved conflicts for merge of 4d329a8f to klp-modular-dev-plus-aosp

Change-Id: Id8096712bc63fe16f93dca4a7963440e11087f7a
2014-06-29 17:55:24 -07:00
parent 05759ef766 4d329a8f12
commit bc2b05299d
1 changed files with 2 additions and 1 deletions
--- a/Android.mk
+++ b/Android.mk
@@ -535,7 +535,8 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \
    -since $(SRC_API_DIR)/17.txt 17 \
    -since $(SRC_API_DIR)/18.txt 18 \
    -since $(SRC_API_DIR)/19.txt 19 \
-		-werror -hide 111 -hide 113 \
+    -since $(SRC_API_DIR)/20.txt 20 \
+		-werror -hide 113 \
 		-overview $(LOCAL_PATH)/core/java/overview.html

 framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR:= \