tree 7ed16abd4b23f6f29d27e64c86c43e2a91e48744
parent 9664b24172188765653812b4eda03223c32272eb
parent 0457db37de22d430df0e55a7552dcfe81b701627
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.