tree e8d05ad5b5576ab57843f600476aa7e86846d6cc
parent d70cfe3f854a20c1517d87700f7ad29a2b4464d1
parent f70e39a90dc2843365e72f86d95cb2db537c97a0
author Tao Bao <tbao@google.com> 1493145360 +0000
committer android-build-merger <android-build-merger@google.com> 1493145360 +0000

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

Change-Id: I0ccdafddf54b96e7c55bdef29d9835b254ee07c2