tree 7ac658ccb6206464251cd42ebf90b9cd7b0449be
parent 443d884e16fad2e01a97aa788d4b30de53c94048
parent 46730fc78388607fd562044cbaaa26ffc9f65337
author Dianne Hackborn <hackbod@google.com> 1280172261 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280172261 -0700

am 46730fc7: Fix handling of application disabled state.

Merge commit '46730fc78388607fd562044cbaaa26ffc9f65337' into gingerbread-plus-aosp

* commit '46730fc78388607fd562044cbaaa26ffc9f65337':
  Fix handling of application disabled state.