From 151dfac555c95d892fa30eb6804da21b491dac28 Mon Sep 17 00:00:00 2001
From: Dirk Dougherty <nobody@android.com>
Date: Tue, 7 Jul 2009 11:18:52 -0700
Subject: AI 150351: Doc updates for Android 1.5 SDK r3.   BUG=1790234

Automated import of CL 150351
---
 Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index b59de97..720a148 100644
--- a/Android.mk
+++ b/Android.mk
@@ -309,7 +309,7 @@ web_docs_sample_code_flags := \
 # most current Android platform version included in the SDK package. 
 framework_docs_SDK_VERSION :=  1.5
 # release version for SDK (ie "Release x")
-framework_docs_SDK_REL_ID :=   2
+framework_docs_SDK_REL_ID :=   3
 framework_docs_SDK_CURRENT_DIR := $(framework_docs_SDK_VERSION)_r$(framework_docs_SDK_REL_ID)
 
 framework_docs_LOCAL_DROIDDOC_OPTIONS += \
-- 
cgit v1.1


From 13d30dc375de954ea70bbab2c89ce7e1e58fcf8c Mon Sep 17 00:00:00 2001
From: Dirk Dougherty <nobody@android.com>
Date: Tue, 7 Jul 2009 17:37:13 -0700
Subject: AI 150369: Add localized TOCs for developer site.   BUG=1910893

Automated import of CL 150369
---
 Android.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index 720a148..231c4c9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -376,7 +376,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
-- 
cgit v1.1


From ab41ea3d24511ad9debdc1ba9b596c11bff8489d Mon Sep 17 00:00:00 2001
From: Dirk Dougherty <nobody@android.com>
Date: Wed, 8 Jul 2009 14:41:49 -0700
Subject: AI 150390: Roll the docs back to 1.5 r2, temporarily.   BUG=1790234

Automated import of CL 150390
---
 Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index 231c4c9..d30bf6e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -309,7 +309,7 @@ web_docs_sample_code_flags := \
 # most current Android platform version included in the SDK package. 
 framework_docs_SDK_VERSION :=  1.5
 # release version for SDK (ie "Release x")
-framework_docs_SDK_REL_ID :=   3
+framework_docs_SDK_REL_ID :=   2
 framework_docs_SDK_CURRENT_DIR := $(framework_docs_SDK_VERSION)_r$(framework_docs_SDK_REL_ID)
 
 framework_docs_LOCAL_DROIDDOC_OPTIONS += \
-- 
cgit v1.1