Merge "New framework performance tests." into ics-mr1

LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)

LOCAL_MODULE_TAGS := tests

LOCAL_SRC_FILES := $(call all-subdir-java-files)

LOCAL_PACKAGE_NAME := FrameworkPerf

LOCAL_AAPT_FLAGS = -c 120dpi,240dpi,160dpi,161dpi,320dpi,nodpi

include $(BUILD_PACKAGE)

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

        package="com.android.frameworkperf">

    <uses-permission android:name="android.permission.WAKE_LOCK" />

    <uses-sdk android:minSdkVersion="5" />

    <application>

        <activity android:name="FrameworkPerfActivity" android:label="Framework Perf">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.LAUNCHER" />

            </intent-filter>

        </activity>

        <service android:name="SchedulerService">

        </service>

    </application>

</manifest>