resolved conflicts for merge of 35e79e32 to gingerbread-plus-aosp

Change-Id: I039355b9d5852436c8352efc5a85590e5f2bc080
This commit is contained in:
Jean-Baptiste Queru
2010-10-11 14:44:10 -07:00

View File

@@ -48,6 +48,7 @@ import android.graphics.drawable.ColorDrawable;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Environment;
import android.os.Handler;
import android.os.Parcelable;
import android.os.SystemClock;
@@ -230,7 +231,8 @@ public final class Launcher extends Activity
mAppWidgetHost.startListening();
if (PROFILE_STARTUP) {
android.os.Debug.startMethodTracing("/sdcard/launcher");
android.os.Debug.startMethodTracing(
Environment.getExternalStorageDirectory() + "/launcher");
}
loadHotseats();