commit 3d19bf1df33c19407594bb6434244cde620d691e
author Robert Ly <robertly@google.com> Mon Jun 30 01:03:52 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 30 01:03:52 2014 +0000
tree 27b38c9aeae89109a3b6adb8490904408a6047ab
parent 9c5ac7aef16d26bfa9d8f4b9bd1fec4c5b93b69f
parent bc2b05299d5fb369aa5c912ccad8e8e3ade06d90

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

* commit 'bc2b05299d5fb369aa5c912ccad8e8e3ade06d90':
  add API reference docs filtering for level 20

Android.mk

diff --git a/Android.mk b/Android.mk
index 61181f7..a38e9e7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -645,7 +645,8 @@
     -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:= \