tree e713a606ec0b010b4dbcb9e3364a101425b56b57
parent d06df51bcd7bcc2656089a529fa6a455bad00d37
parent 33357f5477a24cb16bd3dd692fe5ca14755ab033
author Brad Fitzpatrick <bradfitz@android.com> 1285116285 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285116285 -0700

am 33357f54: am 6490257d: Make netd restart when system server hangs on it.

Merge commit '33357f5477a24cb16bd3dd692fe5ca14755ab033'

* commit '33357f5477a24cb16bd3dd692fe5ca14755ab033':
  Make netd restart when system server hangs on it.