am b368f4d8: am 38caff23: Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1

* commit 'b368f4d85d8b5e567f605c991a6c5c6ff1c868d8':
  SurfaceFlinger: Fix a typo.