tree 2c7dd9a03c2f517d700c08f18570fa4cae4783ea
parent 1dfcd0cc96d0cf50d81fe71101389a30e2bdbf2c
parent cfff54270b7b09e66eb618b51706c3f8779fb110
author George Mount <mount@google.com> 1414715928 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414715928 +0000

am cfff5427: am 57928195: Merge "Fix NPE when snapshot ImageView uses ScaleType.MATRIX." into lmp-mr1-dev

* commit 'cfff54270b7b09e66eb618b51706c3f8779fb110':
  Fix NPE when snapshot ImageView uses ScaleType.MATRIX.