diff options
| author | Grace Kloba <klobag@google.com> | 2010-04-02 09:19:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-02 09:19:06 -0700 |
| commit | 95ec80add24b66db24ca3765c577054e17979f36 (patch) | |
| tree | 7a13d65bca39938309b90f95dfb57f45aedfe844 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4beb20feeb6f84063dce4b6680cf8fc7e828a93a (diff) | |
| parent | 4443e6ce77d9c9fbac5eea4db5303dce0d6d6a57 (diff) | |
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 '61c3a13e5f9d20c621f49598a0082063404c5f7e' into froyo-plus-aosp
* commit '61c3a13e5f9d20c621f49598a0082063404c5f7e':
Instead of holding an ApplicationContext, JWebCoreJavaBridge
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions