commit 51f234aa2b3d13bb294a3bd0e98ee45f2e6df857
author Mathias Agopian <mathias@google.com> Mon Oct 19 15:04:54 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 19 15:04:54 2009 -0700
tree 6a99ace311f7f21eb92f3c3875dbbd3e927b6f77
parent 2058da44e95aa07a27850cc44178f36185da2f9f
parent 448a64a84089f6600dfda70c134f8531ba0bb34f

am a4aa677d: am b263450f: am 3662f9ee: Merge change Ide4c8cbc into eclair

Merge commit 'a4aa677db36651e806f38e8aa7e8532da4f06b0d'

* commit 'a4aa677db36651e806f38e8aa7e8532da4f06b0d':
  fix [2151588] glTexSubImage2D() allows pixel format conversion

opengl/tests/fillrate/Android.mk

diff --git a/opengl/tests/fillrate/Android.mk b/opengl/tests/fillrate/Android.mk
index a7d30c2..191c59b 100644
--- a/opengl/tests/fillrate/Android.mk
+++ b/opengl/tests/fillrate/Android.mk
@@ -6,6 +6,7 @@
 
 LOCAL_SHARED_LIBRARIES := \
 	libcutils \
+	libutils \
     libEGL \
     libGLESv1_CM \
     libui

opengl/tests/finish/Android.mk

diff --git a/opengl/tests/finish/Android.mk b/opengl/tests/finish/Android.mk
index 5620814..aa607c6 100644
--- a/opengl/tests/finish/Android.mk
+++ b/opengl/tests/finish/Android.mk
@@ -6,6 +6,7 @@
 
 LOCAL_SHARED_LIBRARIES := \
 	libcutils \
+	libutils \
     libEGL \
     libGLESv1_CM \
     libui

opengl/tests/swapinterval/Android.mk

diff --git a/opengl/tests/swapinterval/Android.mk b/opengl/tests/swapinterval/Android.mk
index 619447c..9a4145e 100644
--- a/opengl/tests/swapinterval/Android.mk
+++ b/opengl/tests/swapinterval/Android.mk
@@ -6,6 +6,7 @@
 
 LOCAL_SHARED_LIBRARIES := \
 	libcutils \
+	libutils \
     libEGL \
     libGLESv1_CM \
     libui