merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sun, 30 Oct 2011 13:48:12 +0000 (06:48 -0700)]

Trivial merge