diff options
| author | Scott Main <smain@google.com> | 2011-03-30 16:40:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-30 16:40:03 -0700 |
| commit | 4cead493fd77db24826ed925222860d5b473363d (patch) | |
| tree | 1715eef215c80d6f38993d63d140a71beccae25d /Android.mk | |
| parent | 05e11b29b28006270a508e015723601eba5f4301 (diff) | |
| parent | 02a7f8eb3a5680a5b4c00b649b461bcb65c665e4 (diff) | |
| download | frameworks_base-4cead493fd77db24826ed925222860d5b473363d.zip frameworks_base-4cead493fd77db24826ed925222860d5b473363d.tar.gz frameworks_base-4cead493fd77db24826ed925222860d5b473363d.tar.bz2 | |
am 02a7f8eb: am 5c35c059: am 5b68c655: Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1
* commit '02a7f8eb3a5680a5b4c00b649b461bcb65c665e4':
docs: update makefile to show javadocs diffs for api level 12
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -370,6 +370,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 |