am cc16024f: Merge "Differentiate between system_server and unknown." into ics-mr1

* commit 'cc16024f101c0fca211fcd069b3917becf7a3c00':
  Differentiate between system_server and unknown.
This commit is contained in:
Jeff Sharkey 2011-10-28 22:27:38 +00:00 committed by Android Git Automerger
commit 7bfe20fc49

Diff Content Not Available