summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am f912aaa3: am 599c05f3: Merge "Revert "Put canvas on a layer"" into ics-mr1John Reck2011-12-132-7/+1
|\
| * am 599c05f3: Merge "Revert "Put canvas on a layer"" into ics-mr1John Reck2011-12-132-7/+1
| |\
| | * Merge "Revert "Put canvas on a layer"" into ics-mr1John Reck2011-12-132-7/+1
| | |\
| | | * Revert "Put canvas on a layer"John Reck2011-12-132-7/+1
* | | | Merge "Removed computeCursorRings."Victoria Lease2011-12-131-3/+0
|\ \ \ \
| * | | | Removed computeCursorRings.Victoria Lease2011-12-121-3/+0
* | | | | Merge "update callback mechanism, adds nativeDiscardAllTextures for TileBench...Chris Craik2011-12-135-24/+44
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | update callback mechanism, adds nativeDiscardAllTextures for TileBenchmark toolChris Craik2011-12-135-24/+44
* | | | | Merge "Removed ConstructPartRects()."Victoria Lease2011-12-121-104/+3
|\ \ \ \ \
| * | | | | Removed ConstructPartRects().Victoria Lease2011-12-121-104/+3
* | | | | | am a6335830: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-120-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-090-0/+0
| |\ \ \ \ \
| | * \ \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-080-0/+0
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
* | | | | | | am 5f0a489e: am c52e5656: Merge "Fix ANR when hitting very large layers" into...Nicolas Roard2011-12-121-5/+8
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am c52e5656: Merge "Fix ANR when hitting very large layers" into ics-mr1Nicolas Roard2011-12-081-5/+8
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Fix ANR when hitting very large layers" into ics-mr1Nicolas Roard2011-12-081-5/+8
| | |\ \ \ \ \
| | | * | | | | Fix ANR when hitting very large layersNicolas Roard2011-12-081-5/+8
* | | | | | | | am 397afc9c: am 2ee79460: Merge "Reset framework inval when done zooming" int...Chris Craik2011-12-121-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | |
| * | | | | | am 2ee79460: Merge "Reset framework inval when done zooming" into ics-mr1Chris Craik2011-12-081-0/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Reset framework inval when done zooming" into ics-mr1Chris Craik2011-12-081-0/+1
| | |\ \ \ \ \
| | | * | | | | Reset framework inval when done zoomingChris Craik2011-12-081-0/+1
| | | |/ / / /
* | | | | | | Merge "Fix use of LOG_VERBOSE in WebHistory"Steve Block2011-12-121-18/+18
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fix use of LOG_VERBOSE in WebHistorySteve Block2011-12-121-18/+18
* | | | | | | Merge "Swap tiles when viewport changes slightly, and properly cap prepare bo...Chris Craik2011-12-093-4/+11
|\ \ \ \ \ \ \
| * | | | | | | Swap tiles when viewport changes slightly, and properly cap prepare boundsChris Craik2011-12-093-4/+11
* | | | | | | | Merge "Fix the repaint inval mechanism for layers - cherry-pick from MR1"Nicolas Roard2011-12-093-1/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix the repaint inval mechanism for layers - cherry-pick from MR1Nicolas Roard2011-12-093-1/+16
| |/ / / / / / /
* | | | | | | | am 1e39112e: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-090-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-080-0/+0
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| | * | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-080-0/+0
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
* | | | | | | am aa816687: Merge "Prevent native crashes on client cert request" into ics-mr1Selim Gurun2011-12-092-11/+12
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | |
| * | | | | Merge "Prevent native crashes on client cert request" into ics-mr1Selim Gurun2011-12-082-11/+12
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Prevent native crashes on client cert requestSelim Gurun2011-12-072-11/+12
* | | | | | am e50c6da1: Merge "Revert change that caused text in floating divs to not re...Mangesh Ghiware2011-12-071-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Revert change that caused text in floating divs to not reflow." into i...Mangesh Ghiware2011-12-071-1/+1
| |\ \ \ \ \
| | * | | | | Revert change that caused text in floating divs to not reflow.Mangesh Ghiware2011-12-071-1/+1
* | | | | | | am c00fdf0b: (-s ours) Merge "Fix the repaint inval mechanism for layers - DO...Nicolas Roard2011-12-070-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix the repaint inval mechanism for layers - DO NOT MERGE" into ics-mr1Nicolas Roard2011-12-073-4/+15
| |\ \ \ \ \ \
| | * | | | | | Fix the repaint inval mechanism for layers - DO NOT MERGENicolas Roard2011-12-073-4/+15
* | | | | | | | am 1d9cab1b: Merge "Fix crash" into ics-mr1John Reck2011-12-071-3/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Fix crash" into ics-mr1John Reck2011-12-071-3/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Fix crashJohn Reck2011-12-071-3/+6
| | |/ / / / / /
* | | | | | | | am 84117244: Merge "fix viewport lagging a drawGL call behind" into ics-mr1Chris Craik2011-12-071-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "fix viewport lagging a drawGL call behind" into ics-mr1Chris Craik2011-12-071-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | fix viewport lagging a drawGL call behindChris Craik2011-12-071-1/+1
* | | | | | | | am f288ebbc: Merge "Account for dirty tiles doubly in texture counting" into ...Chris Craik2011-12-071-2/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Merge "Account for dirty tiles doubly in texture counting" into ics-mr1Chris Craik2011-12-071-2/+13
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Account for dirty tiles doubly in texture countingChris Craik2011-12-061-2/+13
| | |/ / / /
* | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-070-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-060-0/+0
| |\ \ \ \ \
generated by cgit v1.1 at 2024-08-30 01:44:37 +0000