commit 8fa17c4f225590d9dbe59b813a5054a506b3f19c
author Mike Reed <reed@google.com> Thu Jan 21 08:07:22 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 21 08:07:22 2010 -0800
tree 56f02ede2e21df83ae87f440c899f4d17785a281
parent 15eb5b562b10f293bc5de162075895b54400f684
parent 79f107bdb2c509abb02cfca92ca9dba6187282bc

am 79f107bd: Do not merge

Merge commit '79f107bdb2c509abb02cfca92ca9dba6187282bc' into eclair-plus-aosp

* commit '79f107bdb2c509abb02cfca92ca9dba6187282bc':
  Do not merge

res/drawable/pattern_carbon_fiber_dark.png

diff --git a/res/drawable/pattern_carbon_fiber_dark.png b/res/drawable/pattern_carbon_fiber_dark.png
index 562fb51..07af4b6 100644
--- a/res/drawable/pattern_carbon_fiber_dark.png
+++ b/res/drawable/pattern_carbon_fiber_dark.png
Binary files differ

src/com/android/browser/MeshTracker.java

diff --git a/src/com/android/browser/MeshTracker.java b/src/com/android/browser/MeshTracker.java
index 8c9c00e..aa7099f 100644
--- a/src/com/android/browser/MeshTracker.java
+++ b/src/com/android/browser/MeshTracker.java
@@ -101,7 +101,7 @@
         }
 
         private void doit2(float dx, float dy) {
-            final float scale = 0.4f;  // temper how far we actually move
+            final float scale = 0.35f;  // temper how far we actually move
             dx *= scale;
             dy *= scale;
             final float cornerScale = 0.25f;