tree 733ed1b30ade379432e83e72208bd357cbe37584
parent 092238916fd5d10090c0bcad33644778a1f366e7
parent c86d904b71be950ad973d803d1a19c6cd13be669
author Jamie Gennis <jgennis@google.com> 1298849242 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1298849242 -0800

Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread