tree 5d336b480d0cdab3bdd161c28ecc81820a1065b1
parent e3264d7234f0568d6619c8955f5480963a2019ff
parent 267d4fa58ba38160df9fe33d4ea126fe7e5d6230
author Iliyan Malchev <malchev@google.com> 1254972315 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254972315 -0700

Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Launcher2 into eclair-mr2-plus-aosp