tree 95d6cf6296ab180504dd65c1457ec6e445abde10
parent cd93486d20a22832b5c831f9235cb991ec6dd31d
parent 7cb404dda770da24aaf1b484d6575d5480cf080f
author Chris Craik <ccraik@google.com> 1379469378 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379469378 -0700

am 7cb404dd: am a42ceb03: Merge "Disallow negative scale matrices in merged Bitmap drawing" into klp-dev

* commit '7cb404dda770da24aaf1b484d6575d5480cf080f':
  Disallow negative scale matrices in merged Bitmap drawing