Merge branch 'eclair' of git://android.git.kernel.org/platform/frameworks/base into eclair