am d6f7f225: Merge "Load bitmaps in the correct format." into gingerbread

Merge commit 'd6f7f225689ecd33dc54699acc01cfafc781c20d' into gingerbread-plus-aosp

* commit 'd6f7f225689ecd33dc54699acc01cfafc781c20d':
  Load bitmaps in the correct format.