tree a93dec03d3e318b61416b3a4394ef5b43e42a867
parent 8f9a1575aaafa9160c247be93eabe3c50933bdeb
parent ee5c87eea737e47ab38e19625a32ac2fc0057ddd
author Elliott Hughes <enh@google.com> 1448054067 +0000
committer android-build-merger <android-build-merger@google.com> 1448054067 +0000

Merge "Track name change from adb_main to adb_server_main."
am: ee5c87eea7

* commit 'ee5c87eea737e47ab38e19625a32ac2fc0057ddd':
  Track name change from adb_main to adb_server_main.