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