3b916233cb
* commit '48294b0d9388cff632f0e6ae5220305d342c76fb': Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)