Merge "fix build"

Author: guang-google

tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java

@@ -16,7 +16,6 @@
 
 package com.android.dumprendertree;
 
-import com.android.browser.WebViewProperties;
 import com.android.dumprendertree.forwarder.ForwardService;
 
 import android.app.Activity;
@@ -978,4 +977,4 @@ public void setDefaultWebSettings(WebView webview) {
     private boolean mIsGeolocationPermissionSet;
     private boolean mGeolocationPermission;
     private Map mPendingGeolocationPermissionCallbacks;
-}
+}