summaryrefslogtreecommitdiffstats
path: root/samples
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-06-02 07:35:57 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-06-02 07:35:57 -0700
commit4bdec4ab5d3deb28e29c460100a4e3c0b25d37cf (patch)
tree2c8bc654924c6810cab04d6f690703ceac7e534d /samples
parent032ae72e19d9a12fff483664b975392ef63f2fb7 (diff)
parent72d89196dd920338253b39b0daac9c0f7d04b8a7 (diff)
downloadandroid_development-4bdec4ab5d3deb28e29c460100a4e3c0b25d37cf.tar.gz
android_development-4bdec4ab5d3deb28e29c460100a4e3c0b25d37cf.tar.bz2
android_development-4bdec4ab5d3deb28e29c460100a4e3c0b25d37cf.zip
merge from open-source master
Change-Id: I0d2492c58689315f4caaa9bcb908296c26f53ed6
Diffstat (limited to 'samples')
-rw-r--r--samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/SpriteTextRenderer.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/SpriteTextRenderer.java b/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/SpriteTextRenderer.java
index e01d6ef68..551f7d240 100644
--- a/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/SpriteTextRenderer.java
+++ b/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/SpriteTextRenderer.java
@@ -23,7 +23,6 @@ import java.nio.ByteOrder;
import java.nio.FloatBuffer;
import java.nio.ShortBuffer;
-import javax.microedition.khronos.egl.EGL10;
import javax.microedition.khronos.egl.EGLConfig;
import javax.microedition.khronos.opengles.GL10;