tree b57d06765a238e7d5d4cc2876777d0cf27fdf335
parent 37d76d0c88fd4d49a8121cf2975e69a3e6a16fc9
parent 1d873510ff7ab9a09b807e96ac913a01bd190831
author Josh Gao <jmgao@google.com> 1472591518 +0000
committer android-build-merger <android-build-merger@google.com> 1472591518 +0000

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

Change-Id: Ibd3e787d8593b0a484ffa46ee5f7292828a9d128