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