am f774814b: Merge "Use UID instead of PID."
Jeff Sharkey [Thu, 8 Dec 2011 20:09:42 +0000 (12:09 -0800)]
* commit 'f774814bc9397d9b598593689c84770c35dc3248':
  Use UID instead of PID.


Trivial merge