tree bd73574526a2a13b96e0b8b595d33a90a6ecc804
parent 952c7384bbdcc6a0da6093ce97307b007e664c64
parent db7b742f65b2b88ea414e666e1079cc21b51f715
author Jamie Gennis <jgennis@google.com> 1298850921 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1298850921 -0800

am e630e5f4: am 919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread

* commit 'e630e5f49ba15005172dceeda7299569b2d2351f':
  Prevent SurfaceFlinger from using layer token 31.