Merge "new LOCAL_DEX_PREOPT option "nostripping"" into ics-mr0
diff --git a/tools/droiddoc/templates-sdk/assets/android-developer-docs.css b/tools/droiddoc/templates-sdk/assets/android-developer-docs.css
index 61074dd..4e759da 100644
--- a/tools/droiddoc/templates-sdk/assets/android-developer-docs.css
+++ b/tools/droiddoc/templates-sdk/assets/android-developer-docs.css
@@ -381,6 +381,21 @@
color:#999;
}
+div#deprecatedSticker {
+ display:none;
+ z-index:99;
+ position:fixed;
+ right:15px;
+ top:114px;
+ margin:0;
+ padding:1em;
+ background:#FFF;
+ border:1px solid #dddd00;
+ box-shadow:-5px 5px 10px #ccc;
+ -moz-box-shadow:-5px 5px 10px #ccc;
+ -webkit-box-shadow:-5px 5px 10px #ccc;
+}
+
div#naMessage {
display:none;
width:555px;
@@ -395,7 +410,6 @@
margin:50px 0;
padding:4em 4em 3em;
background:#FFF;
- background:rgba(255,255,255,1);
border:1px solid #dddd00;
box-shadow:-10px 10px 40px #888;
-moz-box-shadow:-10px 10px 40px #888;
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 2cb5680..4957354 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -151,7 +151,8 @@
try:
data = zip.read("RECOVERY/RAMDISK/etc/recovery.fstab")
except KeyError:
- raise ValueError("Could not find RECOVERY/RAMDISK/etc/recovery.fstab")
+ print "Warning: could not find RECOVERY/RAMDISK/etc/recovery.fstab in %s." % zip
+ data = ""
d = {}
for line in data.split("\n"):