tree 1c2aee418bc78773aff239d56f29b6c3cfdfb30e
parent 3be100bcac21306632c156fa746743d67f1fb653
parent e0ba5920d07d8255f8df1dc98700fd3331f8acc2
author Jeff Sharkey <jsharkey@android.com> 1319829884 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1319829884 -0700

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