tree e9e4da5c1846b8dda80f917b76408185a1376e96
parent 0fef28fbd1706ebfc9e53a1290c8e88886be03e7
parent 51ca4889774a56fce30b629defc9e3b920f67156
author Josh Gao <jmgao@google.com> 1553806951 -0700
committer android-build-merger <android-build-merger@google.com> 1553806951 -0700

Merge "adbd: wait for FUNCTIONFS_BIND for up to a second, then retry." am: bfcb981b32 am: 80268fd592
am: 51ca488977

Change-Id: Ia4a29eedde07ea29b0a7650179330386ecf19af1