From: Kalle Raita <kraita@google.com>
Date: Tue, 20 Dec 2016 21:38:32 +0000 (-0800)
Subject: resolve merge conflicts of b6d3261 to nyc-mr1-dev-plus-aosp
X-Git-Tag: upstream/0.1.0~361^2~40^2~126
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed852bf5575be3a1865cf436db5b65eab3026b23;p=platform%2Fupstream%2FVK-GL-CTS.git

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

Test: Tried to run the install script locally
Change-Id: I2c34fa110c811741ad53bd42143bfd2a371b459a
---

diff --git a/android/scripts/common.py b/android/scripts/common.py
index 7940f4a..ef52764 100644
--- 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: