am a120d482: Merge change 25644 into eclair

Merge commit 'a120d4820d1c40a113fb9f46e996299eaa22ea04' into eclair-plus-aosp

* commit 'a120d4820d1c40a113fb9f46e996299eaa22ea04':
  add Eclair to the droiddoc 'since' options so that we
This commit is contained in:
Scott Main
2009-09-18 10:07:10 -07:00
committed by Android Git Automerger

View File

@@ -341,6 +341,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \
-since ./frameworks/base/api/2.xml 2 \
-since ./frameworks/base/api/3.xml 3 \
-since ./frameworks/base/api/4.xml 4 \
-since ./frameworks/base/api/current.xml Eclair \
-error 1 -error 2 -warning 3 -error 4 -error 6 -error 8 \
-overview $(LOCAL_PATH)/core/java/overview.html