| commit | f48214a739f25ff1e3fc1827988fe591ae983fdc | [log] [tgz] |
|---|---|---|
| author | Mathias Agopian <mathias@google.com> | Mon Jun 01 14:30:07 2009 -0700 |
| committer | Mathias Agopian <mathias@google.com> | Mon Jun 01 14:30:07 2009 -0700 |
| tree | 26ef24817a033d37221e33c0b5e5972a4ede0ec2 | |
| parent | ac4a5b3e4559e7b83d9647f141bb058f747c5518 [diff] | |
| parent | f56e06a2344baba76763782d8359323eae789d29 [diff] |
Merge commit 'goog/master' into merge_master
diff --git a/standalone/main.cpp b/standalone/main.cpp index 5e7ad76..31d0c59 100644 --- a/standalone/main.cpp +++ b/standalone/main.cpp
@@ -4,7 +4,7 @@ #include <GLES/gl.h> #include <pthread.h> #include <ui/EventHub.h> -#include <ui/EGLDisplaySurface.h> +#include <ui/FramebufferNativeWindow.h> extern void AndroidInitArgs(int argc, char** argv); extern int AndroidInit();