tree ddc5faf9bcac84c69d02475e485feda635d5755a
parent 13a75d5f1ecdd216f76cb1a165b6af45acb7eec3
parent 2e2656ccaa5ed6cc1adc2d50c8efb67777422834
author Daniel Sandler <dsandler@android.com> 1274726211 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274726211 -0700

am 2e2656cc: Merge "Disable hotseat buttons if AllApps is visible." into froyo