Grace Kloba 8dbf510573 am 54fccf8a: Merge "Update the Webkit version." into froyo ...

Merge commit '54fccf8a074f1b743df5b270c4f85e0e602d7f46' into froyo-plus-aosp

* commit '54fccf8a074f1b743df5b270c4f85e0e602d7f46':
  Update the Webkit version.

2010-04-06 12:38:47 -07:00

..

config

…

java

am bd4808dc: Merge "Correctly resize dialogs when measured in WRAP_CONTENT Bug #2549649" into froyo

2010-04-06 12:38:33 -07:00

jni

Merge "Fix crash while turning bluetooth on, due to a race condition." into froyo

2010-03-31 18:36:35 -07:00

res

Update the Webkit version.

2010-04-06 11:23:01 -07:00

tests

Merge "More framework tests cleanup." into froyo

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