Merge change 21783 into eclair
* changes:
Windows: Fix platform build.
diff --git a/cleanspec.mk b/cleanspec.mk
index 26f8e0c..0929363 100644
--- a/cleanspec.mk
+++ b/cleanspec.mk
@@ -72,6 +72,7 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libcrypto_intermediates)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libssl_intermediates)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/EXECUTABLES/openssl_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/sholes/system/build.prop)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/tools/droiddoc/templates/assets/android-developer-core.css b/tools/droiddoc/templates/assets/android-developer-core.css
index 447eace..fcb51ab 100644
--- a/tools/droiddoc/templates/assets/android-developer-core.css
+++ b/tools/droiddoc/templates/assets/android-developer-core.css
@@ -134,7 +134,7 @@
li ul,
li ol {
- margin:.5em 0 0 0;
+ margin:0;
padding: 0 0 0 2em;
}
diff --git a/tools/droiddoc/templates/assets/android-developer-docs.css b/tools/droiddoc/templates/assets/android-developer-docs.css
index 726694d..d72098f 100644
--- a/tools/droiddoc/templates/assets/android-developer-docs.css
+++ b/tools/droiddoc/templates/assets/android-developer-docs.css
@@ -1184,21 +1184,16 @@
padding:0;
}
- #headerLeft .guide {
- display:none;
- }
-
- #headerRight {
+ #header-tabs,
+ #headerRight,
+ #side-nav,
+ #api-info-block {
display:none;
}
#body-content {
position:inherit;
}
-
- #side-nav {
- display:none;
- }
#doc-content {
margin-left:0 !important;