summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-240-0/+0
|\
| * merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-240-0/+0
| |\
* | \ am a4adfec4: Merge "Mark layers as ready to swap if invisible" into ics-mr0Chris Craik2011-10-241-1/+1
|\ \ \
| * \ \ Merge "Mark layers as ready to swap if invisible" into ics-mr0Chris Craik2011-10-241-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Mark layers as ready to swap if invisibleChris Craik2011-10-241-1/+1
* | | | Merge "Fix SW extras for layers"John Reck2011-10-2414-107/+17
|\ \ \ \
| * | | | Fix SW extras for layersJohn Reck2011-10-2414-107/+17
* | | | | am d436d4c3: Merge "Remove unnecessary log" into ics-mr0Bart Sears2011-10-241-1/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge "Remove unnecessary log" into ics-mr0Bart Sears2011-10-241-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Remove unnecessary logNicolas Roard2011-10-231-1/+1
* | | | Merge "Don't force composited layers to be stacking contexts"Chris Craik2011-10-241-1/+1
|\ \ \ \
| * | | | Don't force composited layers to be stacking contextsChris Craik2011-10-211-1/+1
* | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-240-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-210-0/+0
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-200-0/+0
| | |\ \ \
* | | \ \ \ am 5dee9ed2: Merge "Cherry pick 97075" into ics-mr0John Reck2011-10-214-27/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Cherry pick 97075" into ics-mr0John Reck2011-10-214-27/+15
| |\ \ \ \ \
| | * | | | | Cherry pick 97075John Reck2011-10-204-27/+15
* | | | | | | am 5236e6a2: Merge "Cherry pick 94857" into ics-mr0John Reck2011-10-211-2/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Cherry pick 94857" into ics-mr0John Reck2011-10-211-2/+7
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | / | | |_|_|_|/ | |/| | | |
| | * | | | Cherry pick 94857John Reck2011-10-201-2/+7
* | | | | | Merge "WebKit part of fix for bug 5307956"Kristian Monsen2011-10-211-21/+18
|\ \ \ \ \ \
| * | | | | | WebKit part of fix for bug 5307956Kristian Monsen2011-10-191-21/+18
* | | | | | | am 6032fa42: Merge "Implement dual textures for layers to handle zooming corr...Nicolas Roard2011-10-208-41/+175
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | Merge "Implement dual textures for layers to handle zooming correctly." into ...Nicolas Roard2011-10-208-41/+175
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Implement dual textures for layers to handle zooming correctly.Nicolas Roard2011-10-208-41/+175
* | | | | | am 458b4b11: Mark tiles dirty, even if repaintingChris Craik2011-10-201-3/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Mark tiles dirty, even if repaintingChris Craik2011-10-201-3/+4
| | |_|/ / | |/| | |
* | | | | Merge "Cherry-pick WebKit change 89982 to allow secure pages to be loaded fro...Steve Block2011-10-201-1/+1
|\ \ \ \ \
| * | | | | Cherry-pick WebKit change 89982 to allow secure pages to be loaded from the c...Steve Block2011-10-191-1/+1
* | | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-200-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-200-0/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-190-0/+0
| | |\ \ \ \
* | | \ \ \ \ am 94cabcbd: Merge "Force a navcache update before requesting keyboard" into ...John Reck2011-10-191-0/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Force a navcache update before requesting keyboard" into ics-mr0John Reck2011-10-191-0/+4
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Force a navcache update before requesting keyboardJohn Reck2011-10-191-0/+4
* | | | | | | am 81fab713: Merge "Mark tiles dirty when discarded from transfer queue" into...Chris Craik2011-10-191-1/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Mark tiles dirty when discarded from transfer queue" into ics-mr0Chris Craik2011-10-191-1/+6
| |\ \ \ \ \ \
| | * | | | | | Mark tiles dirty when discarded from transfer queueChris Craik2011-10-191-1/+6
| | | |_|_|/ / | | |/| | | |
* | | | | | | am 1fa411c7: fix layer updates dropping invalsChris Craik2011-10-192-52/+53
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |
| * | | | | fix layer updates dropping invalsChris Craik2011-10-192-52/+53
| |/ / / /
* | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-190-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | |
| * | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-180-0/+0
| |\ \ \ | | |/ / | |/| |
* | | | am 8cc0fa17: Re-enable animations on the UI threadNicolas Roard2011-10-184-76/+56
|\ \ \ \ | |/ / /
| * | | Re-enable animations on the UI threadNicolas Roard2011-10-184-76/+56
* | | | Merge "Changed VerticalTextMap class to meet webkit coding style."claireho2011-10-183-21/+16
|\ \ \ \
| * | | | Changed VerticalTextMap class to meet webkit coding style.claireho2011-10-183-21/+16
* | | | | am a6d06cef: Be less aggressive with clippings layers tilesNicolas Roard2011-10-181-0/+12
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Be less aggressive with clippings layers tilesNicolas Roard2011-10-181-0/+12
| | |_|/ | |/| |
* | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-180-0/+0
|\ \ \ \ | | |_|/ | |/| |