tree 696d35b58eea07325f0a839d95eafdf79f9c0583
parent 0197acb26af0439349bff61d8deea7557fe837cd
parent 99bc4b92a42a9db428d4f0519dfbab4d4a519ed9
author Eric Fischer <enf@google.com> 1328897746 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328897746 -0800

am 99bc4b92: 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 '99bc4b92a42a9db428d4f0519dfbab4d4a519ed9':