Merge branch 'eclair' of git://github.com/cyanogen/android_development into eclair