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

* commit 'a06da29bbed98447409213505bd570f976ff8f88':