tree 0d7a8fcdad8a3e96d176008ec21e4d1f3205d0a5
parent ef03a7d293e9f79975c12558bcb76c710b8952c6
parent e547b6238a6f22bd47bdea9a1131ccd363c25635
author Daniel Sandler <dsandler@android.com> 1272044079 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1272044079 -0700

am e547b623: Merge "New Launcher feature: "hotseat" icons." into froyo