commit 04b1cdbe288b80074dc2b92eb61687f4acf96491
author The Android Automerger <android-build@android.com> Tue Jan 31 15:40:59 2012 -0800
committer The Android Automerger <android-build@android.com> Tue Jan 31 15:40:59 2012 -0800
tree 810f448bdafac0c37aa602eb5752b1bc1a891dca
parent 5583c80be1dba9db2205e6e02a1f02dbbae4fd4c
parent a925a6e2a5b59aa12a18a2e7d44f63841aa00276

merge in ics-mr1-release history after reset to ics-mr1

core/build_id.mk

diff --git a/core/build_id.mk b/core/build_id.mk
index fbdf99b..4b5be2a 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -19,4 +19,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-export BUILD_ID=IMM26B
+export BUILD_ID=IMM30

tools/droiddoc/templates-sdk/assets/images/home/google-plus-small.png

diff --git a/tools/droiddoc/templates-sdk/assets/images/home/google-plus-small.png b/tools/droiddoc/templates-sdk/assets/images/home/google-plus-small.png
new file mode 100644
index 0000000..5bb7d7a
--- /dev/null
+++ b/tools/droiddoc/templates-sdk/assets/images/home/google-plus-small.png
Binary files differ

tools/droiddoc/templates-sdk/assets/images/home/google-plus.png

diff --git a/tools/droiddoc/templates-sdk/assets/images/home/google-plus.png b/tools/droiddoc/templates-sdk/assets/images/home/google-plus.png
new file mode 100644
index 0000000..90871e1
--- /dev/null
+++ b/tools/droiddoc/templates-sdk/assets/images/home/google-plus.png
Binary files differ