resolve merge conflicts of b6d3261 to nyc-mr1-dev-plus-aosp am: ed852bf557

am: 900673646e

Change-Id: Ie357de73c562ce54ef3b8192c156822dc45f78c7

diff --git a/android/scripts/common.py b/android/scripts/common.py
index 7940f4a..ef52764 100644 (file)
--- a/android/scripts/common.py
+++ b/android/scripts/common.py
@@ -173,7 +173,7 @@ def getDevices (adb):
        if proc.returncode != 0:
                raise Exception("adb devices -l failed, got %d" % proc.returncode)
 
-       ptrn = re.compile(r'^([a-zA-Z0-9]+)\s+.*product:([^\s]+)\s+model:([^\s]+)\s+device:([^\s]+)')
+       ptrn = re.compile(r'^([a-zA-Z0-9\.:]+)\s+.*product:([^\s]+)\s+model:([^\s]+)\s+device:([^\s]+)')
        devices = []
        for line in stdout.splitlines()[1:]:
                if len(line.strip()) == 0: