commit a433be70632e02e32dfc2e26f03e7cabb7f0e208
author Michael Jurka <mikejurka@google.com> Wed Oct 10 14:15:46 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 10 14:15:46 2012 -0700
tree a4806fca16d22780237a4c61b14638afdd508586
parent 5b589a01cd291ae3599bc3824f6732c109df056a
parent b86d516bccffc56af9716a39f3d217e928d02d04

Merge "Update custom cling params" into jb-mr1-dev

res/values/dimens.xml

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 628884f..e82f618 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -25,6 +25,7 @@
     <!-- entries for custom clings, will be set in overlays -->
     <add-resource type="dimen" name="custom_cling_margin_top" />
     <add-resource type="dimen" name="custom_cling_margin_right" />
+    <add-resource type="dimen" name="custom_cling_margin_left" />
 
 <!-- Workspace -->
     <!-- qsb_bar_height_inset represents qsb_bar_height minus the padding

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 700f921..6fcda8a 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -55,7 +55,6 @@
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;