diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-26 21:47:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-26 21:47:08 -0700 |
| commit | 96616bb59f2673ee55053b261faf828c52be638c (patch) | |
| tree | fef46ab6cbebcdf64fd46e2b2398d54d44ef2206 /Android.mk | |
| parent | f0e9f05d06f930a4f35f4518f09a25c16adc35f9 (diff) | |
| parent | eec841f0505c3aeb5b18e53f48b755ff69b78c15 (diff) | |
| download | frameworks_base-96616bb59f2673ee55053b261faf828c52be638c.zip frameworks_base-96616bb59f2673ee55053b261faf828c52be638c.tar.gz frameworks_base-96616bb59f2673ee55053b261faf828c52be638c.tar.bz2 | |
am eec841f0: Merge change 8560 into donut
Merge commit 'eec841f0505c3aeb5b18e53f48b755ff69b78c15'
* commit 'eec841f0505c3aeb5b18e53f48b755ff69b78c15':
AI 150460: Add missing art files for menu_guidelines doc.
AI 150397: turn off the right arrow in the carousel -- we only have 3 items.
AI 150390: Roll the docs back to 1.5 r2, temporarily.
AI 150381: Add localized content (ja2) to developer site.
AI 150380: Add localized content (ja) for developer site.
AI 150369: Add localized TOCs for developer site.
AI 150351: Doc updates for Android 1.5 SDK r3.
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -444,7 +444,8 @@ LOCAL_DROIDDOC_OPTIONS:= \ $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \ $(web_docs_sample_code_flags) \ -toroot / \ - -hdf android.whichdoc online + -hdf android.whichdoc online \ + -hdf template.showLanguageMenu true LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk |