tree 69f33d22b47959c9522cfef749a5057131aa68f9
parent eca94940924dea2b5bee5e5d6fe70f3542314438
parent 9b4301378bb43f6dcab8e28d7a2965e76724eae3
author Joe Onorato <joeo@android.com> 1285901311 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285901311 -0700

am 0457db37: am ab2e6284: Merge "Use the private version of userActivity." into gingerbread

Merge commit '0457db37de22d430df0e55a7552dcfe81b701627'

* commit '0457db37de22d430df0e55a7552dcfe81b701627':
  Use the private version of userActivity.