Merge commit '59a2c2958d0bcc00402ebb961b02368004117e3b' into eclair-plus-aosp * commit '59a2c2958d0bcc00402ebb961b02368004117e3b': Black is the new black