am 4579ed28: Merge change 26944 into eclair
am 4579ed28: Merge change 26944 into eclair

Merge commit '4579ed287a0f6fc32fbfefdd5c7cf69491fdae99' into eclair-plus-aosp

* commit '4579ed287a0f6fc32fbfefdd5c7cf69491fdae99':
  Add "TYPE=" to type attribute when appropriate.

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