tree 891d6bd6a98c70e37e3993fec0ae906df6ac3bc3
parent 6c5d9a0622ed33be8549f8d4dcdf597b0dc499cf
parent 919853ce244f853966817d4adb2f3b7b6e4bbe74
author Jamie Gennis <jgennis@google.com> 1298850276 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1298850276 -0800

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

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