tree 10477b6d000f6f5b81877e1e8dd05be6432b7b1f
parent 896f93ef6882b21bb08c69e85f33cba7031ba2d6
parent 4d5f1233f009b77f48b09a869e0563cf713fdb30
author Adam Cohen <adamcohen@google.com> 1320712756 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320712756 +0000

am 4d5f1233: am 2632ca01: Merge "Ensuring disabled apps don\'t appear in workspace (issue: 5557311)" into ics-mr1

* commit '4d5f1233f009b77f48b09a869e0563cf713fdb30':
  Ensuring disabled apps don't appear in workspace (issue: 5557311)