tree 10477b6d000f6f5b81877e1e8dd05be6432b7b1f
parent 6b3909fd72efc7c5ca98d2e1c989025984ad0c38
parent 2632ca01e1127a33845f832b60be3df24d73b0f4
author Adam Cohen <adamcohen@google.com> 1320704431 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320704431 +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)