From bb9ecf420f136681a3bd4d5503207733b4dc283b Mon Sep 17 00:00:00 2001
From: "smain@google.com" <smain@google.com>
Date: Tue, 24 Jun 2014 18:40:36 -0700
Subject: [PATCH] undo the butterbar change, because automerger is ruthless

Change-Id: If9953c9c7af1250a26a74691d8aac58808595c85
---
 tools/droiddoc/templates-sdk/assets/css/default.css | 2 +-
 tools/droiddoc/templates-sdk/components/masthead.cs | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index dc73c7f08..eecab79ff 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -4042,7 +4042,7 @@ EndColorStr='#ececec');
 #header-wrapper {
   background: #f9f9f9;
   margin: 0 -10px 0 -10px;
-  padding: 51px 10px 0px 10px;
+  padding: 31px 10px 0px 10px;
   position: relative;
 }
 #header-wrapper #nav-x div.wrap {
diff --git a/tools/droiddoc/templates-sdk/components/masthead.cs b/tools/droiddoc/templates-sdk/components/masthead.cs
index 3971b60d5..c880eee5e 100644
--- a/tools/droiddoc/templates-sdk/components/masthead.cs
+++ b/tools/droiddoc/templates-sdk/components/masthead.cs
@@ -7,13 +7,6 @@
   <!-- Header -->
   <div id="header-wrapper">
     <div id="header">
-      <div id="butterbar-wrapper">
-        <div id="butterbar">
-          <a href="<?cs var:toroot ?>preview/index.html" id="butterbar-message">
-            The SDKs announced at Google IO will be available on June 26th!
-          </a>
-        </div>
-      </div>
       <div class="wrap" id="header-wrap">
         <div class="col-3 logo">
           <a href="<?cs var:toroot ?>index.html">