Android 4.0.4 release 1.2
merge in ics-release history after reset to master