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)
Change-Id: I7217c0e859b384a042c02fe339e745996c6ef49e

1  2 
libs/gui/tests/SurfaceTexture_test.cpp