Merge "Prevent set mInitialScale being overridden by mDefaultScale."

author Shimeng (Simon) Wang <swang@google.com>

Fri, 8 Jul 2011 23:48:23 +0000 (16:48 -0700)

committer Android (Google) Code Review <android-gerrit@google.com>

Fri, 8 Jul 2011 23:48:23 +0000 (16:48 -0700)
author Shimeng (Simon) Wang <swang@google.com>
Fri, 8 Jul 2011 23:48:23 +0000 (16:48 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 8 Jul 2011 23:48:23 +0000 (16:48 -0700)
diff --cc core/java/android/webkit/ZoomManager.java
Simple merge
author	Shimeng (Simon) Wang <swang@google.com>
	Fri, 8 Jul 2011 23:48:23 +0000 (16:48 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 8 Jul 2011 23:48:23 +0000 (16:48 -0700)