summaryrefslogtreecommitdiffstats
path: root/samples
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-06-02 07:41:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-02 07:41:00 -0700
commit4a4484be6267ea92d991cb3a092be1dab0866a17 (patch)
tree813424245743ba08c72c2a297180240559167cb7 /samples
parent5482eca13aa6070e098afb35c91401e3dbd7ced2 (diff)
parent4bdec4ab5d3deb28e29c460100a4e3c0b25d37cf (diff)
downloadandroid_development-4a4484be6267ea92d991cb3a092be1dab0866a17.tar.gz
android_development-4a4484be6267ea92d991cb3a092be1dab0866a17.tar.bz2
android_development-4a4484be6267ea92d991cb3a092be1dab0866a17.zip
am 4bdec4ab: merge from open-source master
Merge commit '4bdec4ab5d3deb28e29c460100a4e3c0b25d37cf' into kraken * commit '4bdec4ab5d3deb28e29c460100a4e3c0b25d37cf': removed unused imports
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;