| commit | 545d190d3e3b69dd3b8b8668b49308415952aa75 | [log] [tgz] |
|---|---|---|
| author | Leon Scroggins <scroggo@google.com> | Wed May 27 22:07:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 27 22:07:39 2015 +0000 |
| tree | 8d17e09718abc66b80a668c7d76fcf60c941b63f | |
| parent | 71f3467aef006641b1fd038f3e9b982f30f62d23 [diff] | |
| parent | 402d30ff52518b06db8998bbce8ef138e7112e6e [diff] |
am 402d30ff: (-s ours) am 21abce44: am f7d70b78: (-s ours) am 60ed36df: Revert "DO NOT MERGE: Prevent integer wrap around for malloc size when creating a SkRegion" * commit '402d30ff52518b06db8998bbce8ef138e7112e6e': Revert "DO NOT MERGE: Prevent integer wrap around for malloc size when creating a SkRegion"