tree 445ba1c3d421649c368af25e7212406a28fd1bbc
parent 57e73fdb0f9d4f63217762d4b6f4f70ab17d78bf
parent 7a4ac6d0ff6f53edfc59d756cbdeeec5750c8ef3
author Jamie Gennis <jgennis@google.com> 1300218655 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300218655 -0700

am 00f47af8: Merge "SurfaceTexture: disallow unsupported uses." into honeycomb-mr1

* commit '00f47af85a98c6dc3b20d04d8ee6b9a327175ab6':
  SurfaceTexture: disallow unsupported uses.