tree a93dec03d3e318b61416b3a4394ef5b43e42a867
parent 5c6912148b2143cbdf4cc580c723fac05e9324f8
parent 9f4fdb3def9264a80e05e473ac67ddc19c1a6ef2
author Elliott Hughes <enh@google.com> 1448053611 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1448053611 +0000

Merge "Track name change from adb_main to adb_server_main."