OSDN Git Service

resolved conflicts for merge of 21938749 to jb-mr1-dev
authorJean-Baptiste Queru <jbq@google.com>
Mon, 20 Aug 2012 17:22:33 +0000 (10:22 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 20 Aug 2012 17:22:33 +0000 (10:22 -0700)
commitd3bbcaff6f0e08db0412d92f42562a2826a58bec
tree0f2ff8b428e9eed40c59f2287c90b54806cfb963
parent0adc8f260023ec25c31ff4ceadde047528cb64ab
parent21938749faf2c4dd0c77bee3dec1f7a85780c85a
resolved conflicts for merge of 21938749 to jb-mr1-dev

Change-Id: I17da10797736f3772a143e2015fe25df0bb3eb3f
libs/gui/SurfaceTextureClient.cpp