tree 696d35b58eea07325f0a839d95eafdf79f9c0583
parent 9d3ecb7dfa8fc689709c836ce78ae76e5d27f80d
parent a2319e198b98fec50020974be310ae873519fa54
author Eric Fischer <enf@google.com> 1328897598 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328897598 -0800

am a2319e19: (-s ours) Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/packages/apps/Launcher2 into ics-scoop-plus-aosp

* commit 'a2319e198b98fec50020974be310ae873519fa54':