tree 97391cb541cbbcf0492b736e80ba5e86fa8a1e95
parent 13984a253de7b32d803c2c216759cd7b730ee7fe
parent 122f14fa7d0ac4d7a62757f596431286f6ab037f
author Erik Gilling <konkers@android.com> 1281969900 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281969900 -0700

am 122f14fa: am 94364b91: surfaceflinger: don\'t check HWComposer numLayers unless one exists

Merge commit '122f14fa7d0ac4d7a62757f596431286f6ab037f'

* commit '122f14fa7d0ac4d7a62757f596431286f6ab037f':
  surfaceflinger: don't check HWComposer numLayers unless one exists