tree 51e65f2fe31a8c2a86b4609b39b55f9e1d3f2c81
parent d987fe1d57b410c1f32f355165c022d5bcec6ba8
parent aad4cef0f320ff0697aa27a57850de19bfa568bf
author Josh Gao <jmgao@google.com> 1472589037 +0000
committer android-build-merger <android-build-merger@google.com> 1472589037 +0000

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

Change-Id: I6ef1ef45fd598e12629a5bb5a28e9dca74e954fe