summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2011-03-30 12:10:13 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-30 12:10:13 -0700
commit5b68c655a1f56dce1ffd6f175e991dd542d415cf (patch)
tree8ef8dbb9eea9e510c56af274d168b516626ad4be
parentebf6a72b3536646ade389c7afa828e316eb93c21 (diff)
parentd3b62c961b90f45b801121ab11b0af9625c91707 (diff)
downloadframeworks_base-5b68c655a1f56dce1ffd6f175e991dd542d415cf.zip
frameworks_base-5b68c655a1f56dce1ffd6f175e991dd542d415cf.tar.gz
frameworks_base-5b68c655a1f56dce1ffd6f175e991dd542d415cf.tar.bz2
Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1
-rw-r--r--Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index a28bde2..b266061 100644
--- a/Android.mk
+++ b/Android.mk
@@ -371,6 +371,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \
-since ./frameworks/base/api/9.xml 9 \
-since ./frameworks/base/api/10.xml 10 \
-since ./frameworks/base/api/11.xml 11 \
+ -since ./frameworks/base/api/12.xml 12 \
-werror -hide 113 \
-overview $(LOCAL_PATH)/core/java/overview.html