Merge commit 'df64cb41fb44d56957cba8e375788d98af7bd8b4' into eclair-plus-aosp * commit 'df64cb41fb44d56957cba8e375788d98af7bd8b4': Icons again
Merge commit 'df64cb41fb44d56957cba8e375788d98af7bd8b4' into eclair-plus-aosp * commit 'df64cb41fb44d56957cba8e375788d98af7bd8b4': Icons again