Android 3.1 release 1
merge in honeycomb-mr1-release history after reset to honeycomb-mr1