diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-23 19:08:20 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-08-23 19:08:20 -0700 |
| commit | 828ef22db863664b8e992adf15ddf92ef570f4f8 (patch) | |
| tree | 570969699e3bf61a9a10237a062801f4704f78fa /WebKit | |
| parent | e4be1fd5f14137de249ee66c000f9dadfb2862d7 (diff) | |
| parent | 0433734318551aac3b7b82b9d8ab5d485d7d0439 (diff) | |
| download | external_webkit-828ef22db863664b8e992adf15ddf92ef570f4f8.zip external_webkit-828ef22db863664b8e992adf15ddf92ef570f4f8.tar.gz external_webkit-828ef22db863664b8e992adf15ddf92ef570f4f8.tar.bz2 | |
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Change-Id: I5e13be05f736290ca88772aaca51273d3996c6c2
Diffstat (limited to 'WebKit')
0 files changed, 0 insertions, 0 deletions