tree bc2b1ad6f67dd3138b82547186473b92904339b1
parent b951b9156366c68bdf7362fdec8361c0544d1d31
parent e1c51b1d9399cdfd8c802eca678141ae431060c9
author Romain Guy <romainguy@android.com> 1257823624 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257823624 -0800

am e1c51b1d: am 50143db9: am 8a73c51e: New position indicators and icons for Launcher2.

Merge commit 'e1c51b1d9399cdfd8c802eca678141ae431060c9'

* commit 'e1c51b1d9399cdfd8c802eca678141ae431060c9':
  New position indicators and icons for Launcher2.