OSDN Git Service

resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp
authorDerek Sollenberger <djsollen@google.com>
Fri, 29 Jul 2011 18:16:18 +0000 (14:16 -0400)
committerDerek Sollenberger <djsollen@google.com>
Fri, 29 Jul 2011 18:16:18 +0000 (14:16 -0400)
commit33e86c7a9143f89ae932034bbfe4c3a9f71114fd
tree42326f0f3d84236a13917882c8d0ee48074faa8c
parent67020c06fcfe2c8d905008412afffbd6f259cdf6
parentbbfbd30383bb8410604f257512a206c2d672776b
resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp

Change-Id: Iebde13c41a2adf4e693d87e808cb0659f913e4e6
include/gui/SurfaceTexture.h
libs/gui/SurfaceTexture.cpp