commit 4010104732bdae0de5027c4241db5d3cb6230252
author Jean-Baptiste Queru <jbq@google.com> Tue Jan 24 08:38:57 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 24 08:38:57 2012 -0800
tree 8084b4a2eec3b8d0a1fa5475f9e01ba9301bd435
parent 514751834753b30d37eae591ccce2e69e3468602
parent 7a8efe57a9505940cd51c7664e8643ec9da9d24d

am 7a8efe57: Merge "Remove non-existent AlarmProvider to fix SDK build."

* commit '7a8efe57a9505940cd51c7664e8643ec9da9d24d':
  Remove non-existent AlarmProvider to fix SDK build.

target/board/generic/device.mk

diff --git a/target/board/generic/device.mk b/target/board/generic/device.mk
index 8b187d5..4edcc19 100644
--- a/target/board/generic/device.mk
+++ b/target/board/generic/device.mk
@@ -19,7 +19,8 @@
 
 PRODUCT_PROPERTY_OVERRIDES := \
     ro.ril.hsxpa=1 \
-    ro.ril.gprsclass=10
+    ro.ril.gprsclass=10 \
+    ro.adb.qemud=1
 
 PRODUCT_COPY_FILES := \
     development/data/etc/apns-conf.xml:system/etc/apns-conf.xml \

target/board/generic_x86/device.mk

diff --git a/target/board/generic_x86/device.mk b/target/board/generic_x86/device.mk
index 1055cba..0dd2bc0 100644
--- a/target/board/generic_x86/device.mk
+++ b/target/board/generic_x86/device.mk
@@ -19,7 +19,8 @@
 
 PRODUCT_PROPERTY_OVERRIDES := \
     ro.ril.hsxpa=1 \
-    ro.ril.gprsclass=10
+    ro.ril.gprsclass=10 \
+    ro.adb.qemud=1
 
 PRODUCT_COPY_FILES := \
     development/data/etc/apns-conf.xml:system/etc/apns-conf.xml \

target/board/vbox_x86/device.mk

diff --git a/target/board/vbox_x86/device.mk b/target/board/vbox_x86/device.mk
index cd74dae..07ebb1c 100644
--- a/target/board/vbox_x86/device.mk
+++ b/target/board/vbox_x86/device.mk
@@ -21,7 +21,8 @@
 
 PRODUCT_PROPERTY_OVERRIDES := \
     ro.ril.hsxpa=1 \
-    ro.ril.gprsclass=10
+    ro.ril.gprsclass=10 \
+    ro.adb.qemud=1
 
 LOCAL_KERNEL := prebuilts/qemu-kernel/x86/kernel-vbox
 

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

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;

tools/droiddoc/templates-sdk/components/masthead.cs

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