tree 83d1eb96c1b64e1b68daa8fb84d7ff61e633acb1
parent 7cd60173144a88d330a14f38404b835b30a42654
parent 5767cf62a45d64980a4bf91bdd2e8357f79e1a4e
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.