Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-21 | 0 | -0/+0 | |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||||
| | * | | | | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-20 | 0 | -0/+0 | |
| | |\ \ \ \ \ | ||||||
* | | \ \ \ \ \ | am 5dee9ed2: Merge "Cherry pick 97075" into ics-mr0 | John Reck | 2011-10-21 | 4 | -27/+15 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Merge "Cherry pick 97075" into ics-mr0 | John Reck | 2011-10-21 | 4 | -27/+15 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Cherry pick 97075 | John Reck | 2011-10-20 | 4 | -27/+15 | |
* | | | | | | | | | am 5236e6a2: Merge "Cherry pick 94857" into ics-mr0 | John Reck | 2011-10-21 | 1 | -2/+7 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
| * | | | | | | | Merge "Cherry pick 94857" into ics-mr0 | John Reck | 2011-10-21 | 1 | -2/+7 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | / / | | |_|_|_|/ / | |/| | | | | | ||||||
| | * | | | | | Cherry pick 94857 | John Reck | 2011-10-20 | 1 | -2/+7 | |
* | | | | | | | Merge "WebKit part of fix for bug 5307956" | Kristian Monsen | 2011-10-21 | 1 | -21/+18 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | WebKit part of fix for bug 5307956 | Kristian Monsen | 2011-10-19 | 1 | -21/+18 | |
* | | | | | | | | am 6032fa42: Merge "Implement dual textures for layers to handle zooming corr... | Nicolas Roard | 2011-10-20 | 8 | -41/+175 | |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | |_|_|_|_|/ / |/| | | | | | | ||||||
| * | | | | | | Merge "Implement dual textures for layers to handle zooming correctly." into ... | Nicolas Roard | 2011-10-20 | 8 | -41/+175 | |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| | * | | | | | Implement dual textures for layers to handle zooming correctly. | Nicolas Roard | 2011-10-20 | 8 | -41/+175 | |
* | | | | | | | am 458b4b11: Mark tiles dirty, even if repainting | Chris Craik | 2011-10-20 | 1 | -3/+4 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Mark tiles dirty, even if repainting | Chris Craik | 2011-10-20 | 1 | -3/+4 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge "Cherry-pick WebKit change 89982 to allow secure pages to be loaded fro... | Steve Block | 2011-10-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Cherry-pick WebKit change 89982 to allow secure pages to be loaded from the c... | Steve Block | 2011-10-19 | 1 | -1/+1 | |
* | | | | | | | Reconcile with ics-mr0-release | The Android Open Source Project | 2011-10-20 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | |_|_|_|_|/ |/| | | | | | ||||||
| * | | | | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-20 | 0 | -0/+0 | |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| | * | | | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-19 | 0 | -0/+0 | |
| | |\ \ \ \ | ||||||
* | | \ \ \ \ | am 94cabcbd: Merge "Force a navcache update before requesting keyboard" into ... | John Reck | 2011-10-19 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Merge "Force a navcache update before requesting keyboard" into ics-mr0 | John Reck | 2011-10-19 | 1 | -0/+4 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | * | | | | | Force a navcache update before requesting keyboard | John Reck | 2011-10-19 | 1 | -0/+4 | |
* | | | | | | | am 81fab713: Merge "Mark tiles dirty when discarded from transfer queue" into... | Chris Craik | 2011-10-19 | 1 | -1/+6 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Merge "Mark tiles dirty when discarded from transfer queue" into ics-mr0 | Chris Craik | 2011-10-19 | 1 | -1/+6 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Mark tiles dirty when discarded from transfer queue | Chris Craik | 2011-10-19 | 1 | -1/+6 | |
| | | |_|_|/ / | | |/| | | | | ||||||
* | | | | | | | am 1fa411c7: fix layer updates dropping invals | Chris Craik | 2011-10-19 | 2 | -52/+53 | |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | fix layer updates dropping invals | Chris Craik | 2011-10-19 | 2 | -52/+53 | |
| |/ / / / | ||||||
* | | | | | Reconcile with ics-mr0-release | The Android Open Source Project | 2011-10-19 | 0 | -0/+0 | |
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | | | ||||||
| * | | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-18 | 0 | -0/+0 | |
| |\ \ \ | | |/ / | |/| | | ||||||
* | | | | am 8cc0fa17: Re-enable animations on the UI thread | Nicolas Roard | 2011-10-18 | 4 | -76/+56 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Re-enable animations on the UI thread | Nicolas Roard | 2011-10-18 | 4 | -76/+56 | |
* | | | | Merge "Changed VerticalTextMap class to meet webkit coding style." | claireho | 2011-10-18 | 3 | -21/+16 | |
|\ \ \ \ | ||||||
| * | | | | Changed VerticalTextMap class to meet webkit coding style. | claireho | 2011-10-18 | 3 | -21/+16 | |
* | | | | | am a6d06cef: Be less aggressive with clippings layers tiles | Nicolas Roard | 2011-10-18 | 1 | -0/+12 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Be less aggressive with clippings layers tiles | Nicolas Roard | 2011-10-18 | 1 | -0/+12 | |
| | |_|/ | |/| | | ||||||
* | | | | Reconcile with ics-mr0-release | The Android Open Source Project | 2011-10-18 | 0 | -0/+0 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-17 | 0 | -0/+0 | |
| |\ \ \ | | |/ / | |/| | | ||||||
* | | | | Merge "Part of fix for bug 5152544 Reduce the number of warnings" | Kristian Monsen | 2011-10-18 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Part of fix for bug 5152544 Reduce the number of warnings | Kristian Monsen | 2011-10-12 | 1 | -1/+1 | |
* | | | | | am d76089f2: Merge "Prevent race condition in tile texture discard" into ics-mr0 | Chris Craik | 2011-10-17 | 5 | -16/+24 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Merge "Prevent race condition in tile texture discard" into ics-mr0 | Chris Craik | 2011-10-17 | 5 | -16/+24 | |
| |\ \ \ \ | ||||||
| | * | | | | Prevent race condition in tile texture discard | Chris Craik | 2011-10-17 | 5 | -16/+24 | |
* | | | | | | am e8798411: Don\'t paint/allocate off screen tiles | Chris Craik | 2011-10-17 | 2 | -8/+10 | |
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | ||||||
| * | | | | Don't paint/allocate off screen tiles | Chris Craik | 2011-10-17 | 2 | -8/+10 | |
| |/ / / | ||||||
* | | | | Merge "Reapply CL for "Vertical Writing Mode" support." | claireho | 2011-10-17 | 6 | -18/+64 | |
|\ \ \ \ | ||||||
| * | | | | Reapply CL for "Vertical Writing Mode" support. | claireho | 2011-10-17 | 6 | -18/+64 | |
* | | | | | Reconcile with ics-mr0-release | The Android Open Source Project | 2011-10-17 | 0 | -0/+0 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | ||||||
| * | | | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-14 | 0 | -0/+0 | |
| |\ \ \ \ | | |_|/ / | |/| | | | ||||||
| | * | | | Double number of tile textures allocated - do not merge | Chris Craik | 2011-10-14 | 2 | -2/+4 |