Android 2.3 release 1
Merge branch 'gingerbread' into gingerbread-release