From 06162944abfc0cba869f7e783a7c5a7d94246288 Mon Sep 17 00:00:00 2001
From: jbudorick <jbudorick@chromium.org>
Date: Thu, 3 Sep 2015 11:00:57 -0700
Subject: [Android][telemetry] Update pylib imports for modules that moved into
devil.
BUG=476719
Review URL: https://codereview.chromium.org/1314313004
Cr-Commit-Position: refs/heads/master@{#347187}
---
build/android/pylib/linker/test_case.py | 4 ++--
build/android/pylib/linker/test_runner.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'build/android/pylib/linker')
diff --git a/build/android/pylib/linker/test_case.py b/build/android/pylib/linker/test_case.py
index 0660a03..d25efcd 100644
--- a/build/android/pylib/linker/test_case.py
+++ b/build/android/pylib/linker/test_case.py
@@ -40,10 +40,10 @@ import os
import re
import time
+from devil.android import device_errors
+from devil.android.sdk import intent
from pylib import constants
from pylib.base import base_test_result
-from pylib.device import device_errors
-from pylib.device import intent
ResultType = base_test_result.ResultType
diff --git a/build/android/pylib/linker/test_runner.py b/build/android/pylib/linker/test_runner.py
index b6803e4..6366635 100644
--- a/build/android/pylib/linker/test_runner.py
+++ b/build/android/pylib/linker/test_runner.py
@@ -9,11 +9,11 @@ import os.path
import sys
import traceback
+from devil.android import apk_helper
from pylib import constants
from pylib.base import base_test_result
from pylib.base import base_test_runner
from pylib.linker import test_case
-from pylib.utils import apk_helper
# Name of the Android package to install for this to work.
--
cgit v1.1