tree 0013a04e97baa40e711180b60d58ba553cb886c4
parent 07bde72ff9209de9c037d9bba36bdf0cba299aab
parent 2a4aaf133c8bec9bbfcd50c1eb0f25896f579cd1
author Irfan Sheriff <isheriff@google.com> 1345818592 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345818592 -0700

am 2a4aaf13: Merge "resolved conflicts for merge of 86bb2258 to jb-dev-plus-aosp" into jb-dev-plus-aosp

* commit '2a4aaf133c8bec9bbfcd50c1eb0f25896f579cd1':
  Fix system server restart