am 48294b0d: am e7d3ee9d: Revert "merge various SF fixes from gingerbread to...
am 48294b0d: am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
* commit '48294b0d':
Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)