summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | | | | | | | | | | | | | | 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
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | am 4d33d9fb: am 5fe0a0be: Merge "Crash on Orange media portal"John Reck2012-08-311-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | am 5fe0a0be: Merge "Crash on Orange media portal"John Reck2012-08-311-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Crash on Orange media portal"John Reck2012-08-311-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | Crash on Orange media portalAnders Edenbrandt2012-08-311-0/+6
| | |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | am 76150b63: am 5423878e: Merge "Enable dynamic effect of GIF animating image...Jean-Baptiste Queru2012-08-301-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | am 5423878e: Merge "Enable dynamic effect of GIF animating images in browser"Jean-Baptiste Queru2012-08-301-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | Merge "Enable dynamic effect of GIF animating images in browser"Jean-Baptiste Queru2012-08-301-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | Enable dynamic effect of GIF animating images in browserbxu10X2012-08-301-0/+4
| | |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | am 88c8b226: am 9b636ce4: Merge "webkit: enable no-pic compiling option"Jean-Baptiste Queru2012-08-301-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | | | / / / / / / / / / / / / / / / / / / / / | |_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | am 9b636ce4: Merge "webkit: enable no-pic compiling option"Jean-Baptiste Queru2012-08-301-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | Merge "webkit: enable no-pic compiling option"Jean-Baptiste Queru2012-08-301-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | webkit: enable no-pic compiling optionbxu10X2012-08-141-0/+4
* | | | | | | | | | | | | | | | | | | | | | | Merge "Provide referer when download requested" into jb-mr1-devSelim Gurun2012-08-295-5/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Provide referer when download requestedSelim Gurun2012-08-295-5/+16
| | |_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | am f2b8b88d: am 51619153: Merge "Fix memory leak caused by CSSRuleList wrapper"Jean-Baptiste Queru2012-08-2816-38/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | am 51619153: Merge "Fix memory leak caused by CSSRuleList wrapper"Jean-Baptiste Queru2012-08-2816-38/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | Merge "Fix memory leak caused by CSSRuleList wrapper"Jean-Baptiste Queru2012-08-2816-38/+50
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | Fix memory leak caused by CSSRuleList wrapperxqian62012-08-2416-38/+50
| | |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge "Use new surface flinger API." into jb-mr1-devJeff Brown2012-08-271-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Use new surface flinger API.Jeff Brown2012-08-241-2/+9
| | |_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge "Text around selection falls back to caret rect when not in text." into...George Mount2012-08-272-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Text around selection falls back to caret rect when not in text.George Mount2012-08-232-4/+5
| | |_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |