Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am f912aaa3: am 599c05f3: Merge "Revert "Put canvas on a layer"" into ics-mr1 | John Reck | 2011-12-13 | 2 | -7/+1 |
|\ | |||||
| * | am 599c05f3: Merge "Revert "Put canvas on a layer"" into ics-mr1 | John Reck | 2011-12-13 | 2 | -7/+1 |
| |\ | |||||
| | * | Merge "Revert "Put canvas on a layer"" into ics-mr1 | John Reck | 2011-12-13 | 2 | -7/+1 |
| | |\ | |||||
| | | * | Revert "Put canvas on a layer" | John Reck | 2011-12-13 | 2 | -7/+1 |
* | | | | Merge "Removed computeCursorRings." | Victoria Lease | 2011-12-13 | 1 | -3/+0 |
|\ \ \ \ | |||||
| * | | | | Removed computeCursorRings. | Victoria Lease | 2011-12-12 | 1 | -3/+0 |
* | | | | | Merge "update callback mechanism, adds nativeDiscardAllTextures for TileBench... | Chris Craik | 2011-12-13 | 5 | -24/+44 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | update callback mechanism, adds nativeDiscardAllTextures for TileBenchmark tool | Chris Craik | 2011-12-13 | 5 | -24/+44 |
* | | | | | Merge "Removed ConstructPartRects()." | Victoria Lease | 2011-12-12 | 1 | -104/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Removed ConstructPartRects(). | Victoria Lease | 2011-12-12 | 1 | -104/+3 |
* | | | | | | am a6335830: Reconcile with ics-mr1-release | The Android Open Source Project | 2011-12-12 | 0 | -0/+0 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-12-09 | 0 | -0/+0 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-12-08 | 0 | -0/+0 |
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
* | | | | | | | am 5f0a489e: am c52e5656: Merge "Fix ANR when hitting very large layers" into... | Nicolas Roard | 2011-12-12 | 1 | -5/+8 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am c52e5656: Merge "Fix ANR when hitting very large layers" into ics-mr1 | Nicolas Roard | 2011-12-08 | 1 | -5/+8 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge "Fix ANR when hitting very large layers" into ics-mr1 | Nicolas Roard | 2011-12-08 | 1 | -5/+8 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Fix ANR when hitting very large layers | Nicolas Roard | 2011-12-08 | 1 | -5/+8 |
* | | | | | | | | am 397afc9c: am 2ee79460: Merge "Reset framework inval when done zooming" int... | Chris Craik | 2011-12-12 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | am 2ee79460: Merge "Reset framework inval when done zooming" into ics-mr1 | Chris Craik | 2011-12-08 | 1 | -0/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge "Reset framework inval when done zooming" into ics-mr1 | Chris Craik | 2011-12-08 | 1 | -0/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Reset framework inval when done zooming | Chris Craik | 2011-12-08 | 1 | -0/+1 |
| | | |/ / / / | |||||
* | | | | | | | Merge "Fix use of LOG_VERBOSE in WebHistory" | Steve Block | 2011-12-12 | 1 | -18/+18 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Fix use of LOG_VERBOSE in WebHistory | Steve Block | 2011-12-12 | 1 | -18/+18 |
* | | | | | | | Merge "Swap tiles when viewport changes slightly, and properly cap prepare bo... | Chris Craik | 2011-12-09 | 3 | -4/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Swap tiles when viewport changes slightly, and properly cap prepare bounds | Chris Craik | 2011-12-09 | 3 | -4/+11 |
* | | | | | | | | Merge "Fix the repaint inval mechanism for layers - cherry-pick from MR1" | Nicolas Roard | 2011-12-09 | 3 | -1/+16 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix the repaint inval mechanism for layers - cherry-pick from MR1 | Nicolas Roard | 2011-12-09 | 3 | -1/+16 |
| |/ / / / / / / | |||||
* | | | | | | | | am 1e39112e: Reconcile with ics-mr1-release | The Android Open Source Project | 2011-12-09 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-12-08 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-12-08 | 0 | -0/+0 |
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
* | | | | | | | am aa816687: Merge "Prevent native crashes on client cert request" into ics-mr1 | Selim Gurun | 2011-12-09 | 2 | -11/+12 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Merge "Prevent native crashes on client cert request" into ics-mr1 | Selim Gurun | 2011-12-08 | 2 | -11/+12 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Prevent native crashes on client cert request | Selim Gurun | 2011-12-07 | 2 | -11/+12 |
* | | | | | | am e50c6da1: Merge "Revert change that caused text in floating divs to not re... | Mangesh Ghiware | 2011-12-07 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge "Revert change that caused text in floating divs to not reflow." into i... | Mangesh Ghiware | 2011-12-07 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Revert change that caused text in floating divs to not reflow. | Mangesh Ghiware | 2011-12-07 | 1 | -1/+1 |
* | | | | | | | am c00fdf0b: (-s ours) Merge "Fix the repaint inval mechanism for layers - DO... | Nicolas Roard | 2011-12-07 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "Fix the repaint inval mechanism for layers - DO NOT MERGE" into ics-mr1 | Nicolas Roard | 2011-12-07 | 3 | -4/+15 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix the repaint inval mechanism for layers - DO NOT MERGE | Nicolas Roard | 2011-12-07 | 3 | -4/+15 |
* | | | | | | | | am 1d9cab1b: Merge "Fix crash" into ics-mr1 | John Reck | 2011-12-07 | 1 | -3/+6 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge "Fix crash" into ics-mr1 | John Reck | 2011-12-07 | 1 | -3/+6 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix crash | John Reck | 2011-12-07 | 1 | -3/+6 |
| | |/ / / / / / | |||||
* | | | | | | | | am 84117244: Merge "fix viewport lagging a drawGL call behind" into ics-mr1 | Chris Craik | 2011-12-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge "fix viewport lagging a drawGL call behind" into ics-mr1 | Chris Craik | 2011-12-07 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | fix viewport lagging a drawGL call behind | Chris Craik | 2011-12-07 | 1 | -1/+1 |
* | | | | | | | | am f288ebbc: Merge "Account for dirty tiles doubly in texture counting" into ... | Chris Craik | 2011-12-07 | 1 | -2/+13 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Merge "Account for dirty tiles doubly in texture counting" into ics-mr1 | Chris Craik | 2011-12-07 | 1 | -2/+13 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | Account for dirty tiles doubly in texture counting | Chris Craik | 2011-12-06 | 1 | -2/+13 |
| | |/ / / / | |||||
* | | | | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-12-07 | 0 | -0/+0 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-12-06 | 0 | -0/+0 |
| |\ \ \ \ \ |