tree 2cf03af8cd79b7766a5de44213a005e0df9f7076
parent 41a24f9dd0694b0a40d42ca462fd36a10757086e
parent 2ec72cb9c49e881551d52828d49fee00a0f01dff
author Adam Powell <adamp@android.com> 1350604763 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350604763 -0700

am 2ec72cb9: (-s ours) am cc957682: (-s ours) am 53fd9602: (-s ours) Merge "DO NOT MERGE Fix bug #7297028 Settings app crash when swiping between Downloaded / Running / All for Apps"

* commit '2ec72cb9c49e881551d52828d49fee00a0f01dff':
  DO NOT MERGE Fix bug #7297028 Settings app crash when swiping between Downloaded / Running / All for Apps