diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-24 12:57:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 12:57:51 -0700 |
| commit | c220270aa3f29e2d5fb8bb0ad44296170c3f193f (patch) | |
| tree | 9ed2287ca9e45bdc559cfe701aa0f4362ab1e276 /WebKit/android/WebCoreSupport | |
| parent | 2e3b217097682f42fc27a0ba29d089740353a7ea (diff) | |
| parent | f3151d7b79fdd18bb98f61e807bf7b0780645cf7 (diff) | |
| download | external_webkit-c220270aa3f29e2d5fb8bb0ad44296170c3f193f.zip external_webkit-c220270aa3f29e2d5fb8bb0ad44296170c3f193f.tar.gz external_webkit-c220270aa3f29e2d5fb8bb0ad44296170c3f193f.tar.bz2 | |
am f3151d7b: am 828ef22d: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Merge commit 'f3151d7b79fdd18bb98f61e807bf7b0780645cf7'
* commit 'f3151d7b79fdd18bb98f61e807bf7b0780645cf7':
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
Diffstat (limited to 'WebKit/android/WebCoreSupport')
0 files changed, 0 insertions, 0 deletions