tree 4db1b285036d36cc9b3f48b8721eb916e8ac5d0c
parent 897fa0779f7def3972c43c8530faf5baac8ae41c
parent cca6ca0953b56176ebb406fa89766e326f4d72ac
author Elliott Hughes <enh@google.com> 1448054199 +0000
committer android-build-merger <android-build-merger@google.com> 1448054199 +0000

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

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