tree e3c12267dacc91ec4ce0858a06a1f95b82817ce9
parent c3665faf4525de78c64e1a98106e12f1c23810c9
parent eb00d4afdd0e204bcb8379529bc9ef222dd28abe
author Martijn Coenen <maco@google.com> 1316128728 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316128728 -0700

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