aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Adding missing definitions after the merge of android-5.1.1_r37cm-12.1Jessica Wagantall2016-04-041-0/+3
* Merge tag 'android-5.1.1_r37' into HEADJessica Wagantall2016-04-042-4/+2
|\
| * Update SK_CRASH to default to abort(). DO NOT MERGEDerek Sollenberger2016-02-261-1/+1
| * Purge non-NEON ARM code. DO NOT MERGEmtklein2015-10-273-713/+5
| * SkScaledBitmapSampler: fix memory overwrittenzoran.jovanovic2015-09-011-1/+3
| * DO NOT MERGE Prevent integer wrap around for malloc size when creating a SkRe...djsollen2015-08-131-1/+4
* | [PATCH] Purge non-NEON ARM code. DO NOT MERGEmtklein2015-12-083-714/+5
* | Merge tag 'android-5.1.1_r23' into cm-12.1Ricardo Cerqueira2015-10-051-1/+3
|\ \
| * | SkScaledBitmapSampler: fix memory overwrittenzoran.jovanovic2015-09-011-1/+3
* | | Merge tag 'android-5.1.1_r18' into cm-12.1Ricardo Cerqueira2015-09-101-1/+4
|\| |
| * | DO NOT MERGE Prevent integer wrap around for malloc size when creating a SkRe...djsollen2015-08-141-1/+4
| |/
* | x86: conditionalize code for ARM neon optimizationHoward M. Harte2015-05-041-6/+2
* | Bring back NEON optimized blitter S32_Opaque_D32_filter_DXWei Wang2015-05-046-5/+660
* | Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1stable/cm-12.1-YOG3CRicardo Cerqueira2015-03-1018-145/+228
|\|
| * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-270-0/+0
| |\
| | * merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-11-080-0/+0
| | |\
| | | * merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-11-060-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-11-050-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-11-040-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-11-030-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-11-020-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-11-010-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-10-300-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-10-290-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-10-280-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-10-270-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-10-260-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-10-250-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-10-230-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to 226fe6c926409f3b64b07f0b74e92...The Android Automerger2014-10-220-0/+0
| | | |\
| | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-210-0/+0
| | | | |\
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-200-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-190-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-180-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-160-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-150-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-140-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-130-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-120-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-110-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-090-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-080-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-070-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-060-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-050-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-040-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-020-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-010-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-09-300-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-09-290-0/+0
| | | | |/|