am 5c267863: am f962eb10: Merge "docs: add css for Android Design links and add link to site header" into ics-mr1

* commit '5c26786314c934819d460fb565be200ee8894ed0':
  docs: add css for Android Design links and add link to site header
diff --git a/tools/droiddoc/templates-sdk/assets/android-developer-docs.css b/tools/droiddoc/templates-sdk/assets/android-developer-docs.css
index 03073eb..8e9e5bb 100644
--- a/tools/droiddoc/templates-sdk/assets/android-developer-docs.css
+++ b/tools/droiddoc/templates-sdk/assets/android-developer-docs.css
@@ -706,6 +706,18 @@
   width:auto;
 }
 
+div.design-announce {
+  border-top:1px solid #33B5E5;
+  border-bottom:1px solid #33B5E5;
+  padding:5px 10px 10px 55px;
+  margin:2em 0;
+  background:url('../design/static/ico_styleguide.png') 5px 13px no-repeat;
+}
+
+div.design-announce p {
+  margin: .5em 0 0 0;
+}
+
 div.special {
   padding: .5em 1em 1em 1em;
   margin: 0 0 1em;
diff --git a/tools/droiddoc/templates-sdk/components/masthead.cs b/tools/droiddoc/templates-sdk/components/masthead.cs
index e521489..5910107 100644
--- a/tools/droiddoc/templates-sdk/components/masthead.cs
+++ b/tools/droiddoc/templates-sdk/components/masthead.cs
@@ -28,7 +28,8 @@
              	   //-->
              	</script>
             </span>
-          <?cs /if ?>
+          <?cs /if ?>&nbsp;&nbsp;
+          <a href="<?cs var:toroot ?>design/index.html">Android Design</a>&nbsp;&nbsp;
           <a href="http://www.android.com">Android.com</a>
           </div><?cs 
           call:default_search_box() ?><?cs