diff options
| author | Kenny Root <kroot@google.com> | 2013-09-12 11:51:34 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-09-12 11:51:34 -0700 |
| commit | 06ef81bd707020d579aae980ca30b5f954d9219a (patch) | |
| tree | 3837bd4abc50e09ca69be34069fa730227574db1 /libs | |
| parent | 7c4f236532692b847b9b103df6490549656ae993 (diff) | |
| parent | 1852eb4feba27e5ee080f44fd13a39938d511fc3 (diff) | |
| download | frameworks_native-06ef81bd707020d579aae980ca30b5f954d9219a.zip frameworks_native-06ef81bd707020d579aae980ca30b5f954d9219a.tar.gz frameworks_native-06ef81bd707020d579aae980ca30b5f954d9219a.tar.bz2 | |
resolved conflicts for merge of 1852eb4f to klp-dev-plus-aosp
Change-Id: I7217c0e859b384a042c02fe339e745996c6ef49e
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/gui/tests/SurfaceTexture_test.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libs/gui/tests/SurfaceTexture_test.cpp b/libs/gui/tests/SurfaceTexture_test.cpp index 05b0b67..e4fba15 100644 --- a/libs/gui/tests/SurfaceTexture_test.cpp +++ b/libs/gui/tests/SurfaceTexture_test.cpp @@ -35,7 +35,6 @@ #include <GLES2/gl2ext.h> #include <ui/FramebufferNativeWindow.h> -#include <utils/UniquePtr.h> #include <android/native_window.h> namespace android { |