tree e91521d97bd45aaac0029d9c4dfd95db3f6ad6d0
parent 1b6d85d425fd913e3cad371e21dbb45353fcef2c
parent 9d147e489f0c39dbbb5b0b6536c812280b6c41aa
author Michael Jurka <mikejurka@google.com> 1296782154 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296782154 -0800

am 9d147e48: am c50e2c35: Oops, was disabling hardware layers at the wrong level

* commit '9d147e489f0c39dbbb5b0b6536c812280b6c41aa':
  Oops, was disabling hardware layers at the wrong level