am ba2f1375: (-s ours) am be2ef972: DO NOT MERGE Send local IP address with EHLO instead of "localhost".

Merge commit 'ba2f13754012265626e562f9bb38c588f5bad4c3'

* commit 'ba2f13754012265626e562f9bb38c588f5bad4c3':
  DO NOT MERGE Send local IP address with EHLO instead of "localhost".
This commit is contained in:
Andy Stadler 2010-09-20 19:32:59 -07:00 committed by Android Git Automerger
commit f7534f93a3

Diff Content Not Available