Merge ba3dd323 from gingerbread

Change-Id: I615bf5177abbc680292e0116491da58835c7396f

diff --cc Android.mk
index 7728b02,b817cc6..93e1c4f
--- 1/Android.mk
--- 2/Android.mk
+++ b/Android.mk
@@@ -367,9 -373,9 +367,10 @@@ framework_docs_LOCAL_DROIDDOC_OPTIONS :
      -since ./frameworks/base/api/7.xml 7 \
      -since ./frameworks/base/api/8.xml 8 \
      -since ./frameworks/base/api/9.xml 9 \
 -    -werror -hide 13 \
 -    -overview $(LOCAL_PATH)/core/java/overview.html
+     -since ./frameworks/base/api/10.xml 10 \
 +    -since ./frameworks/base/api/current.xml Honeycomb \
 +              -werror -hide 113 \
 +              -overview $(LOCAL_PATH)/core/java/overview.html
  
  framework_docs_LOCAL_ADDITIONAL_JAVA_DIR:= $(call intermediates-dir-for,JAVA_LIBRARIES,framework)