am 99bc4b92: am a2319e19: (-s ours) Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/packages/apps/Launcher2 into ics-scoop-plus-aosp

* commit '99bc4b92a42a9db428d4f0519dfbab4d4a519ed9':