Merge "Cleanup RSListActivity and RSTest GUI"
diff --git a/tests/java_api/RSUnitTests/gui/com/android/rs/unittest/RSListActivity.java b/tests/java_api/RSUnitTests/gui/com/android/rs/unittest/RSListActivity.java
index c95cada..2de6538 100644
--- a/tests/java_api/RSUnitTests/gui/com/android/rs/unittest/RSListActivity.java
+++ b/tests/java_api/RSUnitTests/gui/com/android/rs/unittest/RSListActivity.java
@@ -6,8 +6,6 @@
import android.content.Context;
import android.graphics.Color;
import android.os.Bundle;
-import android.support.test.rule.ActivityTestRule;
-import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
diff --git a/tests/java_api/RsTest/src/com/android/rs/test/RSTestListActivity.java b/tests/java_api/RsTest/src/com/android/rs/test/RSTestListActivity.java
index d444dab..db76003 100644
--- a/tests/java_api/RsTest/src/com/android/rs/test/RSTestListActivity.java
+++ b/tests/java_api/RsTest/src/com/android/rs/test/RSTestListActivity.java
@@ -1,18 +1,25 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+
package com.android.rs.test;
import com.android.rs.unittest.RSListActivity;
import com.android.rs.unittest.UnitTest;
-import android.app.ListActivity;
-import android.content.Context;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.support.test.rule.ActivityTestRule;
import android.util.Log;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.TextView;
import java.util.ArrayList;
import java.util.List;
