commit 20828c1b3d3d21414a90195e7d12bfa42fdfb145
author Scott Main <smain@google.com> Fri Sep 28 13:07:05 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 28 13:07:05 2012 -0700
tree 1d48bda9ed09b4bdc44831f1b905f61d8f823181
parent 7ed9bf58fab78776f0f80cfc90b217e4d109ef62
parent 43a903c763916dccdd4052037cf64774eeb7582a

am 43a903c7: am 053644db: Merge "add api level 17 to javadoc filter and update version number" into jb-mr1-dev

* commit '43a903c763916dccdd4052037cf64774eeb7582a':
  add api level 17 to javadoc filter and update version number

Android.mk

diff --git a/Android.mk b/Android.mk
index c3126848..c441362 100644
--- a/Android.mk
+++ b/Android.mk
@@ -429,6 +429,7 @@
     -since ./frameworks/base/api/14.txt 14 \
     -since ./frameworks/base/api/15.txt 15 \
     -since ./frameworks/base/api/16.txt 16 \
+    -since ./frameworks/base/api/17.txt 17 \
 		-werror -hide 113 \
 		-overview $(LOCAL_PATH)/core/java/overview.html
 
@@ -539,7 +540,7 @@
 
 ## SDK version identifiers used in the published docs
   # major[.minor] version for current SDK. (full releases only)
-framework_docs_SDK_VERSION:=4.1
+framework_docs_SDK_VERSION:=4.2
   # release version (ie "Release x")  (full releases only)
 framework_docs_SDK_REL_ID:=1