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