tree f28d900ba0444ebaef0926b70713d9e85eaf3c3b
parent 85f3c470abb72964b9dc9b11060e485c70dbba77
parent 2632ca01e1127a33845f832b60be3df24d73b0f4
author Adam Cohen <adamcohen@google.com> 1320704359 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320704359 +0000

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

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