OSDN Git Service

Merge changes I799532f7,I5cffa6eb
authorJamie Gennis <jgennis@google.com>
Fri, 22 Jul 2011 20:34:57 +0000 (13:34 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 22 Jul 2011 20:34:57 +0000 (13:34 -0700)
commit1259e9d6ac474f3e9dec8569fb694c61eeeef4d3
tree1ba16b34e86f96d207b0c11094fec085cacf4b31
parentcf85bad10588bfb1d6a7a4d777b895d2bfcb2224
parent29c870271e8d3f8c40c356283650ba54fe71a16b
Merge changes I799532f7,I5cffa6eb

* changes:
  SurfaceTexture: fix a comment
  SurfaceTexture: remove getAllocator
libs/gui/SurfaceTextureClient.cpp