tree 04861af0abe2a1a8644732820824a79d40149336
parent 673943108c0561128eadd2981a2b7294c227fa01
parent d5ad24300447d4de7af39a9af0ef8a58e420841b
author Josh Gao <jmgao@google.com> 1532734652 -0700
committer android-build-merger <android-build-merger@google.com> 1532734652 -0700

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

Change-Id: Ied1ebbbbd7f38e0910b8bc4ee697aadea9da86b8