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