OSDN Git Service

resolved conflicts for merge of 1852eb4f to klp-dev-plus-aosp
authorKenny Root <kroot@google.com>
Thu, 12 Sep 2013 18:51:34 +0000 (11:51 -0700)
committerKenny Root <kroot@google.com>
Thu, 12 Sep 2013 18:51:34 +0000 (11:51 -0700)
commit06ef81bd707020d579aae980ca30b5f954d9219a
tree3837bd4abc50e09ca69be34069fa730227574db1
parent7c4f236532692b847b9b103df6490549656ae993
parent1852eb4feba27e5ee080f44fd13a39938d511fc3
resolved conflicts for merge of 1852eb4f to klp-dev-plus-aosp

Change-Id: I7217c0e859b384a042c02fe339e745996c6ef49e
libs/gui/tests/SurfaceTexture_test.cpp