diff options
| author | Guang Zhu <guangzhu@google.com> | 2015-08-05 20:10:39 -0700 |
|---|---|---|
| committer | Guang Zhu <guangzhu@google.com> | 2015-08-05 20:10:39 -0700 |
| commit | a20a8358b4f6c485b318e6b5f4e4f1fcd58d8f85 (patch) | |
| tree | ceb1a6a2cd1bc0fd137f0df5dc1d408c610a5434 | |
| parent | bf22bfadba487a9d523cb570167da34d9e414b1d (diff) | |
| parent | 72a40802f8e7d24a3175e09adc4b44a89df54f38 (diff) | |
| download | droiddriver-a20a8358b4f6c485b318e6b5f4e4f1fcd58d8f85.tar.gz | |
resolved conflicts for merge of 72a40802 to master
Change-Id: Ic8aa08be037b02c5b447c9a7e3dd8debc33ccd65
| -rw-r--r-- | droiddriver-android_support_test/src/io/appium/droiddriver/android_support_test/D2AndroidJUnitRunner.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/droiddriver-android_support_test/src/io/appium/droiddriver/android_support_test/D2AndroidJUnitRunner.java b/droiddriver-android_support_test/src/io/appium/droiddriver/android_support_test/D2AndroidJUnitRunner.java index d5502d7..89e32d1 100644 --- a/droiddriver-android_support_test/src/io/appium/droiddriver/android_support_test/D2AndroidJUnitRunner.java +++ b/droiddriver-android_support_test/src/io/appium/droiddriver/android_support_test/D2AndroidJUnitRunner.java @@ -19,8 +19,8 @@ package io.appium.droiddriver.android_support_test; import android.app.Activity; import android.os.Bundle; import android.os.Looper; -import android.support.test.runner.lifecycle.ActivityLifecycleMonitorRegistry; import android.support.test.runner.AndroidJUnitRunner; +import android.support.test.runner.lifecycle.ActivityLifecycleMonitorRegistry; import android.support.test.runner.lifecycle.Stage; import android.util.Log; |