commit 5c35c05909640768bbe7f1ecef3165382825c31b
author Scott Main <smain@google.com> Wed Mar 30 12:12:15 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 30 12:12:15 2011 -0700
tree a05ee46dab6248c4923afdc52b85beca2897b9e3
parent 8de5df439244e77d7892deceb86520551ff0499c
parent 5b68c655a1f56dce1ffd6f175e991dd542d415cf

am 5b68c655: Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1

* commit '5b68c655a1f56dce1ffd6f175e991dd542d415cf':
  docs: update makefile to show javadocs diffs for api level 12

Android.mk

diff --git a/Android.mk b/Android.mk
index de0112c..6216a2c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -371,6 +371,7 @@
     -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