diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-23 23:37:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-23 23:37:10 -0700 |
| commit | f3151d7b79fdd18bb98f61e807bf7b0780645cf7 (patch) | |
| tree | 1f142c2779dc07c8cde064e2ce94f3391613d172 | |
| parent | 0ee151789837b0429171a2eeeedc93ce2f8d8d10 (diff) | |
| parent | 828ef22db863664b8e992adf15ddf92ef570f4f8 (diff) | |
| download | external_webkit-f3151d7b79fdd18bb98f61e807bf7b0780645cf7.zip external_webkit-f3151d7b79fdd18bb98f61e807bf7b0780645cf7.tar.gz external_webkit-f3151d7b79fdd18bb98f61e807bf7b0780645cf7.tar.bz2 | |
am 828ef22d: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Merge commit '828ef22db863664b8e992adf15ddf92ef570f4f8' into gingerbread-plus-aosp
* commit '828ef22db863664b8e992adf15ddf92ef570f4f8':
Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject
Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is changed
0 files changed, 0 insertions, 0 deletions