Merge "Add OptionClass and set default timeout for AddWhitelistPackage"
diff --git a/res/config/google/preparers/amperf-preparers.xml b/res/config/google/preparers/amperf-preparers.xml
new file mode 100644
index 0000000..3543aaa
--- /dev/null
+++ b/res/config/google/preparers/amperf-preparers.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<configuration description="ActivityManager Performance Tests Target Preparers">
+ <target_preparer class="com.android.tradefed.targetprep.AddWhitelistPackage" />
+</configuration>