merge from open-source master

tools/droiddoc/templates/assets/android-developer-docs.css

@@ -1263,10 +1263,4 @@ body .ui-resizable-autohide .ui-resizable-handle { display: none; } /* use 'body
   table, img {
     page-break-inside: avoid;
   }
-
-/*  #qv,
-  #qv-wrapper {
-    display:none;
-  }
-*/
 }

tools/droiddoc/templates/assets/carousel.js

@@ -83,7 +83,7 @@ function buildCarousel() {
     
     
     /* add the bulletins */
-	  var layout = droid.layout;
+    var layout = droid.layout;
     var div = document.createElement("div");
     var imgDiv = document.createElement("div");
     var descDiv = document.createElement("div");
@@ -112,9 +112,6 @@ function buildCarousel() {
     $("#carouselMain").append(div);
     
   }
-
-		
-  
 }
 
 // -- * slider * -- //

tools/droiddoc/templates/customization.cs

@@ -27,4 +27,5 @@ def:custom_masthead() ?>
 <?cs def:custom_buildinfo() ?>Build <?cs var:page.build ?> - <?cs var:page.now ?><?cs /def ?>
 
 <?cs # appears on the side of the page ?>
-<?cs def:custom_left_nav() ?><?cs call:default_left_nav() ?><?cs /def ?>
+<?cs def:custom_left_nav() ?><?cs call:default_left_nav() ?><?cs /def ?>
+