Android 2.3.6 release 1
merge in gingerbread-release history after reset to gingerbread