Merge branch 'eclair' of git@github.com:ctso/android_frameworks_base into eclair