tree aaa72a39896369993806e5bf82c76d84db92e1d2
parent a50d7faff09d5d64251a80ff73684e58a0d9cae1
parent a331d858067bf5b57fddaf3bef2ce2d7c11f116a
author Josh Gao <jmgao@google.com> 1472589187 +0000
committer android-build-merger <android-build-merger@google.com> 1472589187 +0000

Merge "minadbd: rename adb_server_main to minadbd_main." am: 818394869d am: aad4cef0f3
am: a331d85806

Change-Id: Iff2e4199993338425af704dfb885e35884e2bf4f