Merge "Fix build." into eclair
diff --git a/tools/host/src/com/android/cts/DeviceManager.java b/tools/host/src/com/android/cts/DeviceManager.java
index d2d527e..528036e 100644
--- a/tools/host/src/com/android/cts/DeviceManager.java
+++ b/tools/host/src/com/android/cts/DeviceManager.java
@@ -20,8 +20,6 @@
 import com.android.ddmlib.IDevice;
 import com.android.ddmlib.AndroidDebugBridge.IDeviceChangeListener;
 
-import android.os.Environment;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.concurrent.Semaphore;
@@ -345,9 +343,9 @@
                             ts.setTestDevice(newDevice);
                             if (newDevice != device) {
                                 // the connection was dropped or a second reboot occurred
+                                // TODO: replace the hardcoded /sdcard
                                 String cmd = String.format("adb -s %s shell bugreport -o " +
-                                            "%s/bugreports/doubleReboot", deviceSerialNumber,
-                                             Environment.getExternalStorageDirectory().getPath());
+                                            "/sdcard/bugreports/doubleReboot", deviceSerialNumber);
                                 executeCommand(cmd);
                             }
                         } else {