diff --git a/tools/emulator/opengl/README b/tools/emulator/opengl/README
index 71478026c..bec20c5b0 100644
--- a/tools/emulator/opengl/README
+++ b/tools/emulator/opengl/README
@@ -24,7 +24,7 @@ Note that emugen is capable of generating, from a single set of specification
 files, three types of auto-generated sources:
 
   - sources to encode commands into a byte stream.
-  - sources to decide the byte stream into commands.
+  - sources to decode the byte stream into commands.
   - sources to wrap normal procedural EGL/GLES calls into context-aware ones.
 
 Modules under the system/ directory corresponds to code that runs on the
diff --git a/tools/emulator/opengl/tests/emulator_test_renderer/main.cpp b/tools/emulator/opengl/tests/emulator_test_renderer/main.cpp
index b0e49cdb8..cf521d4e4 100644
--- a/tools/emulator/opengl/tests/emulator_test_renderer/main.cpp
+++ b/tools/emulator/opengl/tests/emulator_test_renderer/main.cpp
@@ -30,8 +30,15 @@ int main(int argc, char *argv[])
     int portNum = 22468;
     int winWidth = 320;
     int winHeight = 480;
+    int width, height;
+    const char* env = getenv("ANDROID_WINDOW_SIZE");
     FBNativeWindowType windowId = NULL;
 
+    if (env && sscanf(env, "%dx%d", &width, &height) == 2) {
+        winWidth = width;
+        winHeight = height;
+    }
+
     //
     // Inialize SDL window
     //