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

Change-Id: I039355b9d5852436c8352efc5a85590e5f2bc080

diff --cc src/com/android/launcher2/Launcher.java
index 9626a2e,2742f2f..96934e8
--- 1/src/com/android/launcher2/Launcher.java
--- 2/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@@ -46,8 -46,8 +46,9 @@@ import android.graphics.Canvas
  import android.graphics.drawable.Drawable;
  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;