am af6dd103: Merge "fix ImageView.getImageMatrix()" into jb-mr1-aah-dev
am af6dd103: Merge "fix ImageView.getImageMatrix()" into jb-mr1-aah-dev

* commit 'af6dd103bd2bb0783b9364c703c2623260496d5c':
  fix ImageView.getImageMatrix()

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base