diff --git a/ndk/docs/CHANGES.TXT b/ndk/docs/CHANGES.TXT
index 145933c0b..c6db521e8 100644
--- a/ndk/docs/CHANGES.TXT
+++ b/ndk/docs/CHANGES.TXT
@@ -56,6 +56,10 @@ IMPORTANT CHANGES:
   OpenGL ES 2.0 is currently *not* available from Java, and must be used
   through native code exclusively.
 
+  IMPORTANT: OpenGL ES 2.0 is not supported in the Android emulator at this
+             time. Running/testing any native code that depends on it thus
+             requires a real device.
+
 - The NDK build script will now remove installed binaries from the application
   project's path before starting the build. This ensures that:
 
diff --git a/ndk/docs/STABLE-APIS.TXT b/ndk/docs/STABLE-APIS.TXT
index 700bb8843..48e6b5aeb 100644
--- a/ndk/docs/STABLE-APIS.TXT
+++ b/ndk/docs/STABLE-APIS.TXT
@@ -157,8 +157,7 @@ IV. Android-5 Stable Native APIs:
 ----------------------------------
 
 All the APIs listed below are available for developing native code that runs
-on the Eclair experimental branch, which will be used to make the next official
-platform system images.
+on Android 2.0 system images and above.
 
 
 The OpenGL ES 2.0 Library:
@@ -183,3 +182,8 @@ http://android-developers.blogspot.com/2009/04/introducing-glsurfaceview.html
 
 The "hello-gl2" sample application demonstrate this. It is used to draw a very
 simple triangle with the help of a vertex and fragment shaders.
+
+IMPORTANT NOTE:
+    The Android emulator does not support OpenGL ES 2.0 hardware emulation
+    at this time. Running and testing code that uses this API requires a
+    real device with such capabilities.