tree 469c31a8f59ac74c1aa17734f1902ed7c8a6573d
parent 605241984cc41f62e2f2e005865d7afed504a972
parent ee17242f904730c759272b2576aafc59d764525b
author David Pursell <dpursell@google.com> 1442256581 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442256581 +0000

am ee17242f: Merge "minadbd: update service_to_fd() signature."

* commit 'ee17242f904730c759272b2576aafc59d764525b':
  minadbd: update service_to_fd() signature.