tree 852a66faa6a114eab9e5fe4b6a1f8adfff8acd67
parent 8b2dcfb1049ddc2ff6111c4faa81ae20c6545285
parent 49a49e4f0659696b71c0ec2d32a0ac4948c5d977
author David Pursell <dpursell@google.com> 1442257361 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442257361 +0000

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

* commit '49a49e4f0659696b71c0ec2d32a0ac4948c5d977':
  minadbd: update service_to_fd() signature.