am 6388fe80: Merge change 25383 into eclair

Merge commit '6388fe801cf187f78dafba18bec334d23c0ba5e2' into eclair-plus-aosp

* commit '6388fe801cf187f78dafba18bec334d23c0ba5e2':
  Add bitfields to header for screen shots.  This will allow ddms to distinguish