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

Merge commit '5a14271aacb932ba0d52978c939f74e4c685f7d6'

* commit '5a14271aacb932ba0d52978c939f74e4c685f7d6':
  Load bitmaps in the correct format.