am ca29bb28: Merge "Don\'t crash with non-standard bitmap types." into honeycomb
am ca29bb28: Merge "Don\'t crash with non-standard bitmap types." into honeycomb

* commit 'ca29bb28404643574924b972022907006e76ce6f':
  Don't crash with non-standard bitmap types.

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