Grace Kloba c23799bc27 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

2010-04-02 09:22:07 -07:00

..

config

…

java

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

2010-04-02 09:22:07 -07:00

jni

am b8fc825d: am 3a0d1d11: Merge "Fix crash while turning bluetooth on, due to a race condition." into froyo

2010-03-31 23:22:51 -07:00

res

am 15be35f6: am bf1259b8: Fix 2538826: Allow aspect of LockPatternView to be customized.

2010-04-01 19:41:00 -07:00

tests

Merge "More framework tests cleanup." into froyo

2010-04-01 21:45:41 -07:00