diff options
| author | Grace Kloba <klobag@google.com> | 2010-04-02 09:22:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-02 09:22:07 -0700 |
| commit | 46740ea2fd599f152c1ea567b5a1218c10de0c3e (patch) | |
| tree | a02db8ec4f9529c70a90e48822c7a21f2ac18b25 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 34a9636ac02cdacbb737293e20e5fb0af18fa3fc (diff) | |
| parent | 95ec80add24b66db24ca3765c577054e17979f36 (diff) | |
am f34d9e20: am 61c3a13e: Merge "Instead of holding an ApplicationContext, JWebCoreJavaBridge will have a reference of the current window\'s main WebView. It is only non-null if the WebView\'s window has the focus." into froyo
Merge commit 'f34d9e20c7f4c5537beb4287c79b24ab351bcda4' into kraken
* commit 'f34d9e20c7f4c5537beb4287c79b24ab351bcda4':
Instead of holding an ApplicationContext, JWebCoreJavaBridge
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions