tree c88f69b094cd49ae36aa7f5a187c9df099ddb20e
parent 5412bc993124ae5ce72a6ac88fd942ba3f43eca4
parent 9497779888ca61809744db8d449cb2e4d080eea8
author Eric Fischer <enf@google.com> 1328897335 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328897335 -0800

Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/packages/apps/Launcher2 into ics-scoop-plus-aosp