summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 75fd6068: Merge "Keep text handles in sync with native touch targets" into...John Reck2011-10-273-4/+46
|\
| * Merge "Keep text handles in sync with native touch targets" into ics-mr1John Reck2011-10-273-4/+46
| |\
| | * Keep text handles in sync with native touch targetsJohn Reck2011-10-273-4/+46
* | | am 0b8560de: Add missing save/restore calls to GraphicsContext::fillRectBen Murdoch2011-10-271-0/+4
|\ \ \ | |/ /
| * | Add missing save/restore calls to GraphicsContext::fillRectBen Murdoch2011-10-271-0/+4
| |/
* | Merge "Added Y positions for complex script rendering."claireho2011-10-261-22/+24
|\ \
| * | Added Y positions for complex script rendering.claireho2011-10-211-22/+24
* | | am 4476ae7e: Merge remote branch \'goog/ics-mr0\' into ics-mr1Ed Heyl2011-10-260-0/+0
|\ \ \ | | |/ | |/|
| * | Merge remote branch 'goog/ics-mr0' into ics-mr1Ed Heyl2011-10-260-0/+0
| |\ \
* | \ \ am 1b1aeae5: (-s ours) Merge "DO NOT MERGE Adjust text selection position" in...John Reck2011-10-260-0/+0
|\ \ \ \ | |/ / /
| * | | Merge "DO NOT MERGE Adjust text selection position" into ics-mr1John Reck2011-10-253-3/+12
| |\ \ \
| | * | | DO NOT MERGE Adjust text selection positionJohn Reck2011-10-253-3/+12
* | | | | am f6024a98: (-s ours) Merge "DO NOT MERGE Fix SW extras for layers" into ics...John Reck2011-10-260-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge "DO NOT MERGE Fix SW extras for layers" into ics-mr1John Reck2011-10-2514-107/+17
| |\ \ \ \
| | * | | | DO NOT MERGE Fix SW extras for layersJohn Reck2011-10-2514-107/+17
* | | | | | am c43f9396: Merge "Don\'t draw prefetch page if not necessary" into ics-mr1Chris Craik2011-10-264-23/+33
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Don't draw prefetch page if not necessary" into ics-mr1Chris Craik2011-10-254-23/+33
| |\ \ \ \ \
| | * | | | | Don't draw prefetch page if not necessaryChris Craik2011-10-254-23/+33
| | |/ / / /
* | | | | | am d0e47e8b: Take scale into account when greedily prefetching an entire layerChris Craik2011-10-260-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Take scale into account when greedily prefetching an entire layerChris Craik2011-10-251-2/+2
* | | | | | am affc0848: SwapLayersTextures on all layer changesChris Craik2011-10-260-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | SwapLayersTextures on all layer changesChris Craik2011-10-251-2/+1
* | | | | | am 9bcbd1be: Mark layers as ready to swap if invisibleChris Craik2011-10-260-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Mark layers as ready to swap if invisibleChris Craik2011-10-251-1/+1
* | | | | | am 3528cb86: Remove unnecessary logNicolas Roard2011-10-260-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Remove unnecessary logNicolas Roard2011-10-251-1/+1
| | |/ / / | |/| | |
* | | | | am c0fb399b: (-s ours) Don\'t force composited layers to be stacking contexts...Chris Craik2011-10-260-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Don't force composited layers to be stacking contexts - DO NOT MERGEChris Craik2011-10-251-1/+1
| |/ / /
* | | | Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGESteve Block2011-10-2513-84/+84
* | | | Merge "Report a load error when network loads blocked."Ben Murdoch2011-10-254-19/+26
|\ \ \ \
| * | | | Report a load error when network loads blocked.Ben Murdoch2011-10-254-19/+26
* | | | | Merge "Adjust text selection position"John Reck2011-10-253-3/+12
|\ \ \ \ \
| * | | | | Adjust text selection positionJohn Reck2011-10-243-3/+12
* | | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-250-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-240-0/+0
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
* | | | | | | am 0d4258e7: Merge "Take scale into account when greedily prefetching an enti...Chris Craik2011-10-241-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Take scale into account when greedily prefetching an entire layer" int...Chris Craik2011-10-241-2/+2
| |\ \ \ \ \ \
| | * | | | | | Take scale into account when greedily prefetching an entire layerChris Craik2011-10-241-2/+2
* | | | | | | | am bee2599e: SwapLayersTextures on all layer changesChris Craik2011-10-241-2/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | SwapLayersTextures on all layer changesChris Craik2011-10-241-2/+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-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