Merge change 27306 into eclair

* changes:
  Modified the test case name for the browser page load test.

tests/BrowserPowerTest/src/com/android/browserpowertest/PowerMeasurement.java

@@ -21,7 +21,7 @@ public class PowerMeasurement extends ActivityInstrumentationTestCase2<PowerTest
         super(PKG_NAME, PowerTestActivity.class);
     }
 
-    public void testPageLoad() throws Throwable {
+    public void testPageLoadStaticNYTimes() throws Throwable {
         Instrumentation mInst = getInstrumentation();
         PowerTestActivity act = getActivity();