am 6d152af: AI 148066: Change perf2 app test from Calculator to MusicBro

Merge commit '6d152af15daf3c35f65d5fe66b5bc6dfc0066b24' into donut

* commit '6d152af15daf3c35f65d5fe66b5bc6dfc0066b24':
  AI 148066: Change perf2 app test from Calculator to MusicBrowser.
diff --git a/tests/tests/performance2/AndroidManifest.xml b/tests/tests/performance2/AndroidManifest.xml
index 62430ca..0d439e7 100644
--- a/tests/tests/performance2/AndroidManifest.xml
+++ b/tests/tests/performance2/AndroidManifest.xml
@@ -23,6 +23,6 @@
     </application>
 
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="com.android.calculator2"
+                     android:targetPackage="com.android.music"
                      android:label="CTS tests of android.performance"/>
 </manifest>
diff --git a/tests/tests/performance2/src/android/performance2/cts/AppStartup.java b/tests/tests/performance2/src/android/performance2/cts/AppStartup.java
index f5b283e..fdbddfe 100644
--- a/tests/tests/performance2/src/android/performance2/cts/AppStartup.java
+++ b/tests/tests/performance2/src/android/performance2/cts/AppStartup.java
@@ -21,9 +21,9 @@
 import android.test.InstrumentationTestCase;
 
 public class AppStartup extends InstrumentationTestCase {
-    private static final long MAX_AVG_STARTUP_TIME = 1300;
-    private static final String PACKAGE_UNDER_TEST = "com.android.calculator2";
-    private static final String ACTIVITY_UNDER_TEST = "Calculator";
+    private static final long MAX_AVG_STARTUP_TIME = 500;
+    private static final String PACKAGE_UNDER_TEST = "com.android.music";
+    private static final String ACTIVITY_UNDER_TEST = "MusicBrowserActivity";
     private static final int NUMBER_OF_ITERS = 10;
 
     private Intent buildIntent(final String pkgName, String className) {