summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-280-0/+0
|\
| * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-140-0/+0
| |\
| | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-110-0/+0
| | |\
| | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-090-0/+0
| | | |\
| | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-050-0/+0
| | | | |\
| | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-030-0/+0
| | | | | |\
| | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-300-0/+0
| | | | | | |\
| | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-290-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-280-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-270-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-210-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-200-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-160-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-150-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-140-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * Null checkJohn Reck2012-08-131-1/+1
| | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-130-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-090-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-080-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-070-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-060-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-020-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-07-310-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * am 4045ec3b: am a49c3d24: Reconcile with jb-mr0-releaseThe Android Open Source Project2012-07-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * \ am 62c46b3a: (-s ours) Merge "DO NOT MERGE Push everything into an R-Tree" in...John Reck2012-07-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | * \ \ am b7c99a42: Fix background tiles drawingChris Craik2012-07-272-3/+5
| | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | * | | | Push everything into an R-TreeJohn Reck2012-07-2610-541/+233
* | | | | | | | | | | | | | | | | | | | | | | | | | Fix opaque rect calculation to quickreject transparent shader drawn opsChris Craik2012-09-271-0/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | Force stroke style for radio drawingChris Craik2012-09-271-0/+2
|/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Paint into the right PicturePile" into jb-mr1-devJohn Reck2012-09-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Paint into the right PicturePileJohn Reck2012-09-131-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove broken RLE path" into jb-mr1-devJohn Reck2012-09-131-60/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Remove broken RLE pathJohn Reck2012-09-101-60/+10
| |/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Control access to inherited methods of jsinterface objects" into jb-mr...Selim Gurun2012-09-107-16/+131
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Control access to inherited methods of jsinterface objectsSelim Gurun2012-09-107-16/+131
| |/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Disable clipping painter when painting 400+ operations" into jb-mr1-devChris Craik2012-09-101-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Disable clipping painter when painting 400+ operationsChris Craik2012-09-101-1/+8
* | | | | | | | | | | | | | | | | | | | | | | | Fix crash if SVG tries to load a resourceJohn Reck2012-09-071-0/+3
|/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "Update RenderThemeAndroid drawing" into jb-mr1-devJohn Reck2012-09-061-56/+115
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Update RenderThemeAndroid drawingJohn Reck2012-09-061-56/+115
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | am 43e94fa8: am 1a6030e7: Merge "Remove inconsistency between HistoryItem wri...John Reck2012-09-041-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | am 1a6030e7: Merge "Remove inconsistency between HistoryItem writing/reading"John Reck2012-09-041-4/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Remove inconsistency between HistoryItem writing/reading"John Reck2012-09-041-4/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | Remove inconsistency between HistoryItem writing/readingYaroslav Miroshnychenko2012-09-031-4/+7
| | |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "Avoid unsafe use of SkRefCnt::getRefCnt() in ImagesManager" into jb-mr...Chris Craik2012-08-313-2/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Avoid unsafe use of SkRefCnt::getRefCnt() in ImagesManagerChris Craik2012-08-313-2/+14
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix initialization" into jb-mr1-devJohn Reck2012-08-311-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Fix initializationJohn Reck2012-08-311-0/+1
| |/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix potential corruption/leak in cookiejar." into jb-mr1-devSelim Gurun2012-08-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Fix potential corruption/leak in cookiejar.Selim Gurun2012-08-311-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / / /