summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2010-06-14 14:00:37 -0700
committerThe Android Automerger <android-build@android.com>2010-06-14 14:00:37 -0700
commita0f68e94bd0e7f77df224659512796c7524c7cf5 (patch)
tree9f5fdf07902e9936e6338f0d206f8866e94f6204
parent11056eacc16f0bd82a31e5568d3e246c4af37559 (diff)
parent1067e6895e941f56edc7bc3d7c16a7122fb5259b (diff)
downloadbase-a0f68e94bd0e7f77df224659512796c7524c7cf5.tar.gz
Merge branch 'froyo' into froyo-release
-rw-r--r--docs/html/shareables/icon_templates-v2.0.zipbin2084882 -> 1175095 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/docs/html/shareables/icon_templates-v2.0.zip b/docs/html/shareables/icon_templates-v2.0.zip
index 1c4b4988d2df..1b94698ef4cb 100644
--- a/docs/html/shareables/icon_templates-v2.0.zip
+++ b/docs/html/shareables/icon_templates-v2.0.zip
Binary files differ