tree 04861af0abe2a1a8644732820824a79d40149336
parent 1010f723c6260cb584e26759ad5d973e04375f29
parent 3bef3a72bd6b29014ad82110e65f39bfedfa1df7
author Josh Gao <jmgao@google.com> 1532734409 -0700
committer android-build-merger <android-build-merger@google.com> 1532734409 -0700

Merge "minadbd: avoid overrriding services_to_fd." am: 6f1f2c811a am: 06ce8d32e6
am: 3bef3a72bd

Change-Id: I8419fb54222a6663b66896f6e8ac919a008b8d1b