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.
tree: 75d47cdcbb7eadf0f96aa8203158ca157cc4a260
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE