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

Merge commit '0457db37de22d430df0e55a7552dcfe81b701627'

* commit '0457db37de22d430df0e55a7552dcfe81b701627':
  Use the private version of userActivity.
tree: 69f33d22b47959c9522cfef749a5057131aa68f9
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE