tree 75d47cdcbb7eadf0f96aa8203158ca157cc4a260
parent 1d38aff4f903ab82922723aa9dc831f3360f6566
parent f25ba29a5b683bd2f7194c3276729bcd2cb7ff57
author Joe Onorato <joeo@android.com> 1285895949 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285895949 -0700

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

Merge commit 'ab2e6284845794079d809e62c52c6c380b31c4b5' into gingerbread-plus-aosp

* commit 'ab2e6284845794079d809e62c52c6c380b31c4b5':
  Use the private version of userActivity.