am 04b95313: am c8c79a65: Merge "Re-use existing Surface objects when reading...
am 04b95313: am c8c79a65: Merge "Re-use existing Surface objects when reading them from parcels." into gingerbread
Merge commit '04b95313'
* commit '04b95313':
Re-use existing Surface objects when reading them from parcels.