am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE

* commit '69b8e962e1b8346b33a2c14889547a0ac00c8b17':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE

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