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

* commit '6aa40ac59516d4286b2013e33b9f37633ec0fe91':
  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