Merge branch 'master' of ssh://android-git:29418/platform/packages/apps/Launcher2