| commit | 21abce44194648ee0e1f9bdc2b5e68aa2a87545e | [log] [tgz] |
|---|---|---|
| author | Leon Scroggins <scroggo@google.com> | Wed May 27 21:34:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 27 21:34:54 2015 +0000 |
| tree | a943c17dedd49a82cf60a4610fb0ebbec84ee52b | |
| parent | 6ed1c0d9947636a403319b4d386354de0c0738c5 [diff] | |
| parent | f7d70b78303f4d930a222bbab4b2eaa6c966d3e5 [diff] |
am f7d70b78: (-s ours) am 60ed36df: Revert "DO NOT MERGE: Prevent integer wrap around for malloc size when creating a SkRegion" * commit 'f7d70b78303f4d930a222bbab4b2eaa6c966d3e5': Revert "DO NOT MERGE: Prevent integer wrap around for malloc size when creating a SkRegion"