am fa6e9cf6: am 86ad8662: Merge "Don\'t scale bitmaps to an empty size when targetDpi=0 Bug #7334217" into jb-mr1-dev
am fa6e9cf6: am 86ad8662: Merge "Don\'t scale bitmaps to an empty size when targetDpi=0 Bug #7334217" into jb-mr1-dev

* commit 'fa6e9cf65adf7d27714275510967a0eda0695cd4':
  Don't scale bitmaps to an empty size when targetDpi=0 Bug #7334217

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