tree 65d8a779716c89a9520dae82a5c43e6a95d8f2de
parent c0f2d9522ea5891352e219c4ca8f85ac59287604
parent e87ebb08fba88628a65eae88fc5bc7911cfa7d97
author Robert Greenwalt <rgreenwalt@google.com> 1285256894 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285256894 -0700

am e87ebb08: Merge "Cleanup Netd to prevent getting hung." into gingerbread

Merge commit 'e87ebb08fba88628a65eae88fc5bc7911cfa7d97' into gingerbread-plus-aosp

* commit 'e87ebb08fba88628a65eae88fc5bc7911cfa7d97':
  Cleanup Netd to prevent getting hung.