tree 852a66faa6a114eab9e5fe4b6a1f8adfff8acd67
parent 47506a2c96b7a97093aecca837fe47b080bb3678
parent cd3a68ce371fd446b0b5d8dde4f4a262be1e1fe9
author David Pursell <dpursell@google.com> 1442257811 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442257811 +0000

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

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