aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* RESTRICT AUTOMERGE: Fix bug decoding JCS_RGB jpeg fileslineage-15.1Leon Scroggins III2019-02-0411-403/+426
* RESTRICT AUTOMERGE: Fix heap buffer overflowLeon Scroggins III2019-02-041-0/+16
* RESTRICT AUTOMERGE: Add SkAndroidFrameworkUtils::SafetyNetLogLeon Scroggins III2019-02-043-0/+45
* Merge cherrypicks of [4787603, 4787134, 4787604, 4786834, 4787135, 4787488, 4...android-build-team Robot2018-08-1615-62/+261
|\
| * RESTRICT AUTOMERGE: Cherry-pick "begin cleanup of malloc porting layer"Mike Reed2018-08-1615-62/+261
|/
* Snap for 4417144 from d9a36316eca79044af90373ef09d413889d0a936 to oc-m2-releaseandroid-build-team Robot2017-10-260-0/+0
|\
| * Snap for 4411005 from 6446b6fbd06718010e3b4e13c8892a446d087307 to oc-mr1-releaseandroid-build-team Robot2017-10-230-0/+0
| |\
| | * Update OWNERS file am: bf1fbbd9c4 am: 71c7507b79 am: 9494cea39b am: 0d09a40b6...Leon Scroggins III2017-10-200-0/+0
| | |\
| | | * Update OWNERS file am: bf1fbbd9c4 am: 71c7507b79 am: 9494cea39b am: 0d09a40b6...Leon Scroggins III2017-10-200-0/+0
| | | |\
| | | | * Update OWNERS file am: bf1fbbd9c4 am: 71c7507b79 am: 9494cea39b am: 0d09a40b6...Leon Scroggins III2017-10-200-0/+0
| | | | |\
| | | | | * Update OWNERS file am: bf1fbbd9c4 am: 71c7507b79 am: 9494cea39b am: 0d09a40b6...Leon Scroggins III2017-10-181-2/+4
| | | | | |\
| | | | | | * Update OWNERS file am: bf1fbbd9c4 am: 71c7507b79 am: 9494cea39b am: 0d09a40b6...Leon Scroggins III2017-10-181-2/+4
| | | | | | |\
| | | | | | | * Update OWNERS file am: bf1fbbd9c4 am: 71c7507b79 am: 9494cea39b am: 0d09a40b6...Leon Scroggins III2017-10-181-2/+4
| | | | | | | |\
| | | | | | | | * Update OWNERS file am: bf1fbbd9c4 am: 71c7507b79 am: 9494cea39b am: 0d09a40b6...Leon Scroggins III2017-10-181-2/+4
| | | | | | | | |\
| | | | | | | | | * Update OWNERS file am: bf1fbbd9c4 am: 71c7507b79 am: 9494cea39b am: 0d09a40b6...Leon Scroggins III2017-10-181-2/+4
| | | | | | | | | |\
| | | | | | | | | | * Update OWNERS file am: bf1fbbd9c4 am: 71c7507b79 am: 9494cea39b am: 0d09a40b6aLeon Scroggins III2017-10-181-2/+4
| | | | | | | | | | |\
| | | | | | | | | | | * Update OWNERS file am: bf1fbbd9c4 am: 71c7507b79 am: 9494cea39bLeon Scroggins III2017-10-181-2/+4
| | | | | | | | | | | |\
| | | | | | | | | | | | * Update OWNERS file am: bf1fbbd9c4 am: 71c7507b79Leon Scroggins III2017-10-181-2/+4
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * Update OWNERS file am: bf1fbbd9c4Leon Scroggins III2017-10-181-2/+4
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * Update OWNERS fileLeon Scroggins III2017-10-101-2/+4
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * Update OWNERS fileLeon Scroggins III2017-10-061-2/+4
* | | | | | | | | | | | | | | | Snap for 4386615 from f19789dedc022c9802ea9ab95fe2ca4197e91912 to oc-m2-releaseandroid-build-team Robot2017-10-118-2/+374
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Snap for 4386596 from 67bdaa3a1f209b4fd959eddf6ccb5fad901e9ff2 to oc-mr1-releaseandroid-build-team Robot2017-10-108-2/+374
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Roll external/skia 81e7bf8d6..8c19238a0 (2 commits)Skia_Android Canary Bot2017-10-098-2/+374
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | experiments to speed up drawing 32bit images into 565Mike Reed2017-10-067-2/+372
| | | * | | | | | | | | | | | | | Bring android/o-mr1-release up to date for HEIFLeon Scroggins III2017-10-0312-14/+503
* | | | | | | | | | | | | | | | | Snap for 4384531 from 785d138cf45e08e6395d5f25066816018deddce1 to oc-m2-releaseandroid-build-team Robot2017-10-092-6/+26
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Snap for 4383937 from 65c46d9d47eae252e82d7fdd9c13f96fab31a67c to oc-mr1-releaseandroid-build-team Robot2017-10-080-0/+0
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "Fix SkFILEStream." into nyc-dev am: 3d8955c7c9 am: 28a8f8e12c am: 2ff1...Ben Wagner2017-10-060-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "Fix SkFILEStream." into nyc-dev am: 3d8955c7c9 am: 28a8f8e12c am: 2ff1...Ben Wagner2017-10-060-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Merge "Fix SkFILEStream." into nyc-dev am: 3d8955c7c9 am: 28a8f8e12c am: 2ff1...Ben Wagner2017-10-060-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / | | | | | |/| | | | | | | | | | |
| | | | | * | | | | | | | | | | | Merge "Fix SkFILEStream." into nyc-dev am: 3d8955c7c9 am: 28a8f8e12c am: 2ff1...Ben Wagner2017-10-0613-145/+121
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / | | | | | | |/| | | | | | | | | |
| | | | | | * | | | | | | | | | | Merge "Fix SkFILEStream." into nyc-dev am: 3d8955c7c9 am: 28a8f8e12cBen Wagner2017-10-0613-145/+121
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / | | | | | | | |/| | | | | | | | |
| | | | | | | * | | | | | | | | | Merge "Fix SkFILEStream." into nyc-dev am: 3d8955c7c9Ben Wagner2017-10-0613-145/+121
| | | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / / / | | | | | | | | |/| | | | | | | |
| | | | | | | | * | | | | | | | | Merge "Fix SkFILEStream." into nyc-devBen Wagner2017-10-0613-145/+121
| | | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | |/ / / / / / / | | | | | | | | | |/| | | | | | |
| | | | | | | | | * | | | | | | | Merge "Fix SkFILEStream." into nyc-devTreeHugger Robot2017-10-0613-145/+121
| | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | * | | | | | | | Fix SkFILEStream.Ben Wagner2017-10-0613-145/+121
| | * | | | | | | | | | | | | | | | Fix truncated webp images DO NOT MERGE am: 99740b3bb9 am: ffc7e57387 am: 088c...Leon Scroggins III2017-10-060-0/+0
| | |\| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Fix truncated webp images DO NOT MERGE am: 99740b3bb9 am: ffc7e57387 am: 088c...Leon Scroggins III2017-10-060-0/+0
| | | |\| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Fix truncated webp images DO NOT MERGE am: 99740b3bb9 am: ffc7e57387 am: 088c...Leon Scroggins III2017-10-060-0/+0
| | | | |\| | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | Fix truncated webp images DO NOT MERGE am: 99740b3bb9 am: ffc7e57387 am: 088c...Leon Scroggins III2017-10-060-0/+0
| | | | | |\| | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | Fix truncated webp images DO NOT MERGE am: 99740b3bb9 am: ffc7e57387Leon Scroggins III2017-10-061-1/+4
| | | | | | |\| | | | | | | | | | |
| | | | | | | * | | | | | | | | | | Fix truncated webp images DO NOT MERGE am: 99740b3bb9Leon Scroggins III2017-10-061-1/+4
| | | | | | | |\| | | | | | | | | |
| | | | | | | | * | | | | | | | | | Fix truncated webp images DO NOT MERGELeon Scroggins III2017-10-061-1/+4
| | | | | | | | |\| | | | | | | | |
| | | | | | | | | * | | | | | | | | Fix truncated webp images DO NOT MERGELeon Scroggins III2017-10-061-1/+4
| | | | | | | | | |/ / / / / / / /
| | * | | | | | | | | | | | | | | Fix truncated webp images DO NOT MERGE am: 1d57f616c6 -s ours am: fa7322ed72...Leon Scroggins III2017-10-060-0/+0
| | |\| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Fix truncated webp images DO NOT MERGE am: 1d57f616c6 -s oursLeon Scroggins III2017-10-060-0/+0
| | | |\| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Fix truncated webp images DO NOT MERGELeon Scroggins III2017-10-060-0/+0
| | | | |\| | | | | | | | | | | |
| | | | | * | | | | | | | | | | | Fix truncated webp images DO NOT MERGELeon Scroggins III2017-10-061-1/+4
| * | | | | | | | | | | | | | | | Snap for 4380782 from 724e4c749ff8be13389a8578dea940924a5148c9 to oc-mr1-releaseandroid-build-team Robot2017-10-062-6/+26
| |\| | | | | | | | | | | | | | |