tree ba0995e4f1f4df2be49a8081ff2d03ea11509130
parent c0c44d32c29e033161f1e92fe7ec53a1c14b44b1
parent 50143db9cf91f20247d1ed5bb22eafda401c6b00
author Romain Guy <romainguy@android.com> 1257823474 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257823474 -0800

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

Merge commit '50143db9cf91f20247d1ed5bb22eafda401c6b00' into eclair-mr2-plus-aosp

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