| commit | 9d40989ee4c0b50ca707cd81b76c24e39a4fff2c | [log] [tgz] |
|---|---|---|
| author | Christian Williams <christianw@google.com> | Mon Jun 12 17:53:47 2017 -0700 |
| committer | Christian Williams <christianw@google.com> | Mon Jun 12 17:53:47 2017 -0700 |
| tree | 2e442deaf30b4b8b382a6afe6facfa2a5c2867b4 | |
| parent | 4a5644f7f455d510e2e0fc51c976dbcf2591dcd7 [diff] |
Fix unwanted @Override and delete empty file.
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/RoutingResourceLoader.java b/robolectric-resources/src/main/java/org/robolectric/res/RoutingResourceLoader.java deleted file mode 100644 index e69de29..0000000 --- a/robolectric-resources/src/main/java/org/robolectric/res/RoutingResourceLoader.java +++ /dev/null
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowApplicationPackageManager.java b/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowApplicationPackageManager.java index 65fb35b..15a9613 100644 --- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowApplicationPackageManager.java +++ b/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowApplicationPackageManager.java
@@ -209,7 +209,7 @@ verificationResults.put(id, verificationCode); } - @Override @Implementation + @Implementation public void extendVerificationTimeout(int id, int verificationCodeAtTimeout, long millisecondsToDelay) { verificationTimeoutExtension.put(id, millisecondsToDelay); }