diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-29 19:26:26 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-29 19:26:26 +0000 |
| commit | ec9de3e44c124e17c958cbf3fdaf071ef1643d71 (patch) | |
| tree | 6314a9423ab20cc24003ab995421ce34d0a59752 /remoting/tools | |
| parent | 0b46b51d29b6528ec73f9d3fd20514dcea9cc7cb (diff) | |
| download | chromium_src-ec9de3e44c124e17c958cbf3fdaf071ef1643d71.zip chromium_src-ec9de3e44c124e17c958cbf3fdaf071ef1643d71.tar.gz chromium_src-ec9de3e44c124e17c958cbf3fdaf071ef1643d71.tar.bz2 | |
Import getpass in me2me_virtual_host.py
This fixes merge conflict between revisions 153647 and 153796. The first change
removed import getpass, while the second one depends on it.
TBR=jamiewalch@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10886041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153945 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/tools')
| -rwxr-xr-x | remoting/tools/me2me_virtual_host.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/remoting/tools/me2me_virtual_host.py b/remoting/tools/me2me_virtual_host.py index 8ac760a..53a3118 100755 --- a/remoting/tools/me2me_virtual_host.py +++ b/remoting/tools/me2me_virtual_host.py @@ -11,6 +11,7 @@ import atexit import errno +import getpass import hashlib import json import logging |