Merge branch 'gingerbread-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into gingerbread-plus-aosp