aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 372648a7: Merge "Fix access to freed memory"Jean-Baptiste Queru2012-08-271-1/+1
|\
| * Merge "Fix access to freed memory"Jean-Baptiste Queru2012-08-271-1/+1
| |\
| | * Fix access to freed memoryNikolay Pisanov2012-08-271-1/+1
| |/
* | am c2ad1992: Merge "Forward-compatibility stubs"Jean-Baptiste Queru2012-08-175-0/+138
|\ \ | |/
| * Merge "Forward-compatibility stubs"Jean-Baptiste Queru2012-08-175-0/+138
| |\
| | * Forward-compatibility stubsVictoria Lease2012-08-175-0/+138
| |/
* | Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-07-310-0/+0
|\ \
| * \ merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-310-0/+0
| |\ \
* | \ \ am 1d6fa961: Reduce embolden effect. DO NOT MERGEVictoria Lease2012-07-271-1/+11
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Reduce embolden effect. DO NOT MERGEVictoria Lease2012-07-271-1/+11
* | | am 8c1c7cfa: Cherrypick change to skiaBilly Hewlett2012-06-212-1/+9
|\ \ \
| * | | Cherrypick change to skiaBilly Hewlett2012-06-202-1/+9
* | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-140-0/+0
| |\ \ \ | | |_|/ | |/| |
* | | | am ec1ad08b: DO NOT MERGE Skia solution to fake-bold fallback fonts.Victoria Lease2012-06-131-3/+15
|\ \ \ \ | |/ / /
| * | | DO NOT MERGE Skia solution to fake-bold fallback fonts.Victoria Lease2012-06-131-3/+15
* | | | am 9b1d0758: Merge "Cherrypick change to skia"Jean-Baptiste Queru2012-06-071-0/+34
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge "Cherrypick change to skia"Jean-Baptiste Queru2012-06-071-0/+34
| |\ \ \
| | * | | Cherrypick change to skiaBilly Hewlett2012-06-071-0/+34
| |/ / /
* | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-060-0/+0
| |\ \ \ | | |_|/ | |/| |
* | | | am bd64a4dd: Use FreeType\'s "embolden", but only if face is not already bold.Victoria Lease2012-06-052-7/+11
|\ \ \ \ | |/ / /
| * | | Use FreeType's "embolden", but only if face is not already bold.Victoria Lease2012-05-312-7/+11
* | | | Reconcile with jb-releaseThe Android Open Source Project2012-05-300-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-300-0/+0
| |\ \ \ | | |/ / | |/| |
* | | | am f37732cf: Merge "detect all masks, and don\'t use masksuperblitter with th...Derek Sollenberger2012-05-301-2/+4
|\ \ \ \ | |/ / /
| * | | Merge "detect all masks, and don't use masksuperblitter with those." into jb-devDerek Sollenberger2012-05-301-2/+4
| |\ \ \
| | * | | detect all masks, and don't use masksuperblitter with those.Derek Sollenberger2012-05-291-2/+4
* | | | | Reconcile with nakasi-factoryrom-releaseThe Android Open Source Project2012-05-240-0/+0
|\ \ \ \ \
| * \ \ \ \ merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-220-0/+0
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
* | | | | | Reconcile with jb-releaseThe Android Open Source Project2012-05-220-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-200-0/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-190-0/+0
| | |\ \ \ \
| | | * \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-190-0/+0
| | | |\ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / /
| | | | | |
| \ \ \ \ \
*-. \ \ \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-180-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | | | |/ / / | | |/| | |
| | * | | | merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-180-0/+0
| | |\ \ \ \ | |/ / / / /
| * | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-170-0/+0
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
* | | | | | am 943e1fde: Add support for reusing bitmap in webp format.Owen Lin2012-05-174-75/+140
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Add support for reusing bitmap in webp format.Owen Lin2012-05-174-75/+140
* | | | | | am c85ca84d: Nvidia\'s patch for reusing bitmap in image region decoding.Owen Lin2012-05-173-25/+82
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Nvidia's patch for reusing bitmap in image region decoding.Owen Lin2012-05-173-25/+82
| |/ / / /
* | | | | am 17e8e7f0: Disable the incorrect culling of vertical text.Derek Sollenberger2012-05-161-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Disable the incorrect culling of vertical text.Derek Sollenberger2012-05-161-3/+3
* | | | | am 41b64c06: Merge "Cleanup pixel ref mutexes in Skia" into jb-devDerek Sollenberger2012-05-168-29/+101
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Cleanup pixel ref mutexes in Skia" into jb-devDerek Sollenberger2012-05-168-29/+101
| |\ \ \ \
| | * | | | Cleanup pixel ref mutexes in SkiaDerek Sollenberger2012-05-148-29/+101
| | | | | |
| \ \ \ \ \
*-. \ \ \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | / / | | | |_|/ / | | |/| | |
| | * | | | merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-150-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| * | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-150-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-140-0/+0
| | |\ \ \ | | | |/ / | | |/| |