summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Ruiz <alruiz@google.com>2015-08-03 15:29:42 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-08-03 15:29:42 +0000
commit06e4f0a9cec5fbd32d40871237e35900479925f5 (patch)
treeaa6e84d79e8af2e7f3dbf2fdf1c6a921a192f837
parenta54c5c44b7cb364b2d84604a36f88878e1837710 (diff)
parent10ff62d14bcb564afa8c7502f77a4a632ba1cb10 (diff)
downloadidea-06e4f0a9cec5fbd32d40871237e35900479925f5.tar.gz
Merge "Removed duplicated method implementation." into studio-1.4-dev
-rw-r--r--android/testSrc/com/android/tools/idea/gradle/stubs/android/ProductFlavorStub.java9
1 files changed, 1 insertions, 8 deletions
diff --git a/android/testSrc/com/android/tools/idea/gradle/stubs/android/ProductFlavorStub.java b/android/testSrc/com/android/tools/idea/gradle/stubs/android/ProductFlavorStub.java
index 2bb41c136b1..3517fa3d20c 100644
--- a/android/testSrc/com/android/tools/idea/gradle/stubs/android/ProductFlavorStub.java
+++ b/android/testSrc/com/android/tools/idea/gradle/stubs/android/ProductFlavorStub.java
@@ -15,7 +15,6 @@
*/
package com.android.tools.idea.gradle.stubs.android;
-import com.android.annotations.NonNull;
import com.android.builder.model.ApiVersion;
import com.android.builder.model.ClassField;
import com.android.builder.model.ProductFlavor;
@@ -113,16 +112,10 @@ public class ProductFlavorStub implements ProductFlavor {
throw new UnsupportedOperationException();
}
- @NonNull
- @Override
- public Map<String, String> getTestInstrumentationRunnerArguments() {
- throw new UnsupportedOperationException();
- }
-
@Override
@NotNull
public Map<String, String> getTestInstrumentationRunnerArguments() {
- return Collections.emptyMap();
+ throw new UnsupportedOperationException();
}
@Override