tree 1ba16b34e86f96d207b0c11094fec085cacf4b31
parent cf85bad10588bfb1d6a7a4d777b895d2bfcb2224
parent 29c870271e8d3f8c40c356283650ba54fe71a16b
author Jamie Gennis <jgennis@google.com> 1311366897 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1311366897 -0700

Merge changes I799532f7,I5cffa6eb

* changes:
  SurfaceTexture: fix a comment
  SurfaceTexture: remove getAllocator