Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70b70a6f authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Merge & fix package names"

parents 885f6495 7a9a4eca

apct-tests/perftests/core/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="android.core.perftests">

    package="com.android.perftests.core">



    <application>

        <uses-library android:name="android.test.runner" />
@@ -8,6 +8,6 @@ 
    </application>



    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"

        android:targetPackage="android.core.perftests"/>

        android:targetPackage="com.android.perftests.core"/>



</manifest>

apct-tests/perftests/graphics/src/android/graphics/perftests/PaintHasGlyphPerfTest.java→apct-tests/perftests/core/src/android/graphics/perftests/PaintHasGlyphPerfTest.java

+0 −0

File moved.

View file

apct-tests/perftests/graphics/src/android/graphics/perftests/VectorDrawablePerfTest.java→apct-tests/perftests/core/src/android/graphics/perftests/VectorDrawablePerfTest.java

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import android.support.test.rule.ActivityTestRule; 
import android.support.test.runner.AndroidJUnit4;

import android.test.suitebuilder.annotation.LargeTest;



import android.graphics.perftests.R;

import com.android.perftests.core.R;



import org.junit.Rule;

import org.junit.Test;