merge in ics-release history after reset to master
The Android Automerger [Mon, 12 Dec 2011 15:01:09 +0000 (07:01 -0800)]

Trivial merge