merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 16 Nov 2011 14:47:06 +0000 (06:47 -0800)]

Trivial merge