tree a943c17dedd49a82cf60a4610fb0ebbec84ee52b
parent 6ed1c0d9947636a403319b4d386354de0c0738c5
parent f7d70b78303f4d930a222bbab4b2eaa6c966d3e5
author Leon Scroggins <scroggo@google.com> 1432762494 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432762494 +0000

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"