tree e3c12267dacc91ec4ce0858a06a1f95b82817ce9
parent 7f6e39cf9cafa3224e060fd48fe6676a95f4983f
parent a06da29bbed98447409213505bd570f976ff8f88
author Martijn Coenen <maco@google.com> 1316129059 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316129059 -0700

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

* commit 'a06da29bbed98447409213505bd570f976ff8f88':