merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 2 Nov 2011 13:46:59 +0000 (06:46 -0700)]

Trivial merge