Merge commit '4579ed287a0f6fc32fbfefdd5c7cf69491fdae99' into eclair-plus-aosp * commit '4579ed287a0f6fc32fbfefdd5c7cf69491fdae99': Add "TYPE=" to type attribute when appropriate.
Merge commit '4579ed287a0f6fc32fbfefdd5c7cf69491fdae99' into eclair-plus-aosp * commit '4579ed287a0f6fc32fbfefdd5c7cf69491fdae99': Add "TYPE=" to type attribute when appropriate.