tree 6ce436040f62d84b5844dfffd27ff747f4223a9d
parent 9968866e861a9d4f78dc264bc8adfdf2c5280f39
parent 818394869d36b9db1bf4984585a062d4bb91310f
author Josh Gao <jmgao@google.com> 1472588859 +0000
committer android-build-merger <android-build-merger@google.com> 1472588859 +0000

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

Change-Id: I7a8fe351a8bfa0b7bdc48c89d56647a98018af51