merge in ics-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Sun, 16 Oct 2011 13:59:34 +0000 (06:59 -0700)
committerThe Android Automerger <android-build@android.com>
Sun, 16 Oct 2011 13:59:34 +0000 (06:59 -0700)

Trivial merge