tree 2ce3806e83d3ec9f51cc67735712cb6ac18a9eb5
parent 36683d0fc88e2f23181bea8bb12a143ac2bcafae
parent f849ff34d46fbe0345e6d268e27e29a630c03639
author Tao Bao <tbao@google.com> 1493145089 +0000
committer android-build-merger <android-build-merger@google.com> 1493145089 +0000

Merge "minadbd: Fix a failing test due to SIGPIPE." am: 7b1fffe095
am: f849ff34d4

Change-Id: I930a2e743419a1a9323fa8a3d8deb089d569db49