Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge WebKit at r62496: Initial merge by git | Steve Block | 2010-07-09 | 18 | -90/+126 |
| | | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2 | ||||
* | Merge WebKit at r61871: Initial merge by git. | Kristian Monsen | 2010-07-02 | 16 | -24/+308 |
| | | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5 | ||||
* | Merge webkit.org at r61121: Initial merge by git. | Ben Murdoch | 2010-06-16 | 47 | -1042/+1130 |
| | | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760 | ||||
* | Merge webkit.org at r60469 : Initial merge by git. | Leon Clarke | 2010-06-08 | 49 | -724/+854 |
| | | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234 | ||||
* | Merge WebKit at r60074: Initial merge by git | Steve Block | 2010-05-27 | 73 | -310/+509 |
| | | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7 | ||||
* | Merge WebKit at r59636: Initial merge by git | Kristian Monsen | 2010-05-25 | 27 | -171/+513 |
| | | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91 | ||||
* | Merge Webkit at r58956: Initial merge by Git. | Ben Murdoch | 2010-05-14 | 23 | -57/+268 |
| | | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228 | ||||
* | Merge webkit.org at r58033 : Initial merge by git | Steve Block | 2010-05-11 | 69 | -1287/+841 |
| | | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1 | ||||
* | Merge webkit.org at r55033 : Initial merge by git | Steve Block | 2010-04-27 | 22 | -649/+765 |
| | | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5 | ||||
* | Merge webkit.org at r54731 : Initial merge by git | Steve Block | 2010-02-16 | 40 | -397/+551 |
| | | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a | ||||
* | Merge webkit.org at r54340 : Initial merge by git | Steve Block | 2010-02-15 | 5 | -40/+49 |
| | | | | Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44 | ||||
* | Merge webkit.org at r54127 : Take theirs for changes to JavaScript string ↵ | Steve Block | 2010-02-04 | 3 | -33/+81 |
| | | | | | | | | | | | addition. The conflict is due to the fact that we cherry-picked a WebKit change http://trac.webkit.org/changeset/51978 to fix a bug. This change updates all files touched by this change to match webkit.org. See https://android-git.corp.google.com/g/#change,36411 Change-Id: Ie17c59467b74f3bf3be1149bebe086b92b30afc4 | ||||
* | Merge webkit.org at r54127 : Initial merge by git | Steve Block | 2010-02-04 | 101 | -2241/+2480 |
| | | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82 | ||||
* | Cherry-picks a WebKit change to revert recent changes to String addition for ↵ | Steve Block | 2010-01-04 | 3 | -87/+28 |
| | | | | | | | | | | | | | | | | | JSC. WebKit change http://trac.webkit.org/changeset/51975 modified String addition in JSC to use ropes. However, the change was incorrect, so was rolled back in http://trac.webkit.org/changeset/51978. The last WebKit merge was to revision r51976, so picked up the initial, broken change only. This change cherry-picks http://trac.webkit.org/changeset/51978 to revert the original change. Bug: 2336856 Change-Id: I7f48bce6a7f605779424ba0a7601524ab3a71990 | ||||
* | Merge webkit.org at r51976 : Initial merge by git. | Steve Block | 2009-12-17 | 50 | -534/+1245 |
| | | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43 | ||||
* | Merge webkit.org at r50258 : Initial merge by git. | Steve Block | 2009-11-10 | 60 | -615/+686 |
| | | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0 | ||||
* | Merge webkit.org at R49305 : Automatic merge by git. | Steve Block | 2009-10-20 | 143 | -1214/+3425 |
| | | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7 | ||||
* | Revert "Merge WebKit r47420" | Andrei Popescu | 2009-08-19 | 62 | -969/+340 |
| | | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524. | ||||
* | Merge WebKit r47420 | Ben Murdoch | 2009-08-18 | 62 | -340/+969 |
| | |||||
* | Merge in WebKit r47029. | Ben Murdoch | 2009-08-11 | 83 | -1162/+3078 |
| | |||||
* | Get WebKit r44544. | Feng Qian | 2009-06-17 | 122 | -3377/+4201 |
| | |||||
* | AI 145799: Added back the ANDROID_INSTRUMENT for JS. | Grace Kloba | 2009-04-10 | 1 | -0/+12 |
| | | | | Automated import of CL 145799 | ||||
* | AI 145796: Land the WebKit merge @r42026. | Feng Qian | 2009-04-10 | 27 | -141/+672 |
| | | | | Automated import of CL 145796 | ||||
* | auto import from //depot/cupcake/@136594 | The Android Open Source Project | 2009-03-05 | 152 | -3082/+9304 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 141 | -0/+21018 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 141 | -21018/+0 |
| | |||||
* | Code drop from //branches/cupcake/...@124589 | The Android Open Source Project | 2008-12-17 | 141 | -0/+21018 |