summaryrefslogtreecommitdiffstats
path: root/tools/droiddoc/templates/assets
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2010-01-22 14:27:55 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-01-22 14:27:55 -0800
commit262e821409fbd59b593e56cb75a339e8a2364533 (patch)
tree156feaee98b0cb3f9f8b9c798554062988e7d0f7 /tools/droiddoc/templates/assets
parentdaa3b7a46958206cdac5d21e4235a6dfabb6829a (diff)
parent6339cfe89b62bfa7803ff93c4fc13c9be759f47a (diff)
downloadbuild-262e821409fbd59b593e56cb75a339e8a2364533.zip
build-262e821409fbd59b593e56cb75a339e8a2364533.tar.gz
build-262e821409fbd59b593e56cb75a339e8a2364533.tar.bz2
am 6339cfe8: Merge "doc change: add announce for developer lab at mwc." into eclair
Merge commit '6339cfe89b62bfa7803ff93c4fc13c9be759f47a' into eclair-plus-aosp * commit '6339cfe89b62bfa7803ff93c4fc13c9be759f47a': doc change: add announce for developer lab at mwc.
Diffstat (limited to 'tools/droiddoc/templates/assets')
-rw-r--r--tools/droiddoc/templates/assets/android-developer-core.css2
-rw-r--r--tools/droiddoc/templates/assets/images/home/Android_Dev_Lab_l.pngbin0 -> 16512 bytes
-rw-r--r--tools/droiddoc/templates/assets/images/home/adc2_l.pngbin0 -> 111790 bytes
-rw-r--r--tools/droiddoc/templates/assets/images/home/adc2_s.pngbin0 -> 27250 bytes
4 files changed, 1 insertions, 1 deletions
diff --git a/tools/droiddoc/templates/assets/android-developer-core.css b/tools/droiddoc/templates/assets/android-developer-core.css
index a6e765b..2d1708a 100644
--- a/tools/droiddoc/templates/assets/android-developer-core.css
+++ b/tools/droiddoc/templates/assets/android-developer-core.css
@@ -659,7 +659,7 @@ td.gsc-search-button {
padding: 0px 0px 0px 0px;
float: left;
width: 584px;
- height: 580px;
+ height: 627px;
position:relative;
}
diff --git a/tools/droiddoc/templates/assets/images/home/Android_Dev_Lab_l.png b/tools/droiddoc/templates/assets/images/home/Android_Dev_Lab_l.png
new file mode 100644
index 0000000..3c04f24
--- /dev/null
+++ b/tools/droiddoc/templates/assets/images/home/Android_Dev_Lab_l.png
Binary files differ
diff --git a/tools/droiddoc/templates/assets/images/home/adc2_l.png b/tools/droiddoc/templates/assets/images/home/adc2_l.png
new file mode 100644
index 0000000..0b101a4
--- /dev/null
+++ b/tools/droiddoc/templates/assets/images/home/adc2_l.png
Binary files differ
diff --git a/tools/droiddoc/templates/assets/images/home/adc2_s.png b/tools/droiddoc/templates/assets/images/home/adc2_s.png
new file mode 100644
index 0000000..0d36bdb
--- /dev/null
+++ b/tools/droiddoc/templates/assets/images/home/adc2_s.png
Binary files differ