am 88bccab3: (-s ours) am d3fcd0a1: Merge "minor clean-up. SurfaceFlinger...
am 88bccab3: (-s ours) am d3fcd0a1: Merge "minor clean-up. SurfaceFlinger doesn\'t need libpixelflinger.so. (DO NOT MERGE)" into gingerbread
* commit '88bccab3':
minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)