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