tree c9a625cf9fc325f6264d1448b228c8d8f4197624
parent c8f68e5c7ffef3bc6775edf39a251baf79b81f6b
parent 8606fefa219d63d0a0f3df1b9dcf49cfbfa5b3e5
author Jamie Gennis <jgennis@google.com> 1317421726 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1317421726 -0700

Merge "SurfaceTexture: parameterize the texture target"