Add Robov3 to external/robolectric

- Use prebuilts for Robov3 (unlike Robov2 in external) to allow
  quicker updates of prebuilts since forking of code will be
  discouraged and much harder to do. It also improves build
  speed and allows us to not replicate their complicated
  maven build in gradle.
- Details of jars can be found in README.txts and details on how
  to generate new jars can be found in update_robolectric.sh
- Goal is to have all of Android repo switch to Robov3 and
  delete Robov2 from external.
- Main benefits over v2 is support for KitKat and Lollipop
  API calls.

Change-Id: I60d7b913aaf620f99af4a103d4f93ec705e60fdc
(cherry picked from commit e5966b3cee9413fed1a294adb2128b795f09efc9)

735 files changed, 147 insertions, 0 deletions

diff --git a/Android.mk b/v1/Android.mk
index 3da8260d7..3da8260d7 100644
--- a/Android.mk
+++ b/v1/Android.mk
diff --git a/LICENSE.txt b/v1/LICENSE.txt
index c9dccb8d8..c9dccb8d8 100644
--- a/LICENSE.txt
+++ b/v1/LICENSE.txt
diff --git a/README.md b/v1/README.md
index 665c6aa0c..665c6aa0c 100644
--- a/README.md
+++ b/v1/README.md
diff --git a/build.gradle b/v1/build.gradle
index 0ad4ac66c..0ad4ac66c 100644
--- a/build.gradle
+++ b/v1/build.gradle
diff --git a/build.properties b/v1/build.properties
index f13aaf4d3..f13aaf4d3 100644
--- a/build.properties
+++ b/v1/build.properties
diff --git a/build.xml b/v1/build.xml
index e183a482b..e183a482b 100644
--- a/build.xml
+++ b/v1/build.xml
diff --git a/find-android.bat b/v1/find-android.bat
index 470f346ca..470f346ca 100644
--- a/find-android.bat
+++ b/v1/find-android.bat
diff --git a/find-android.sh b/v1/find-android.sh
index 55f852606..55f852606 100755
--- a/find-android.sh
+++ b/v1/find-android.sh
diff --git a/lib/main/android-support-v4.jar b/v1/lib/main/android-support-v4.jar
index ab81fba80..ab81fba80 100644
--- a/lib/main/android-support-v4.jar
+++ b/v1/lib/main/android-support-v4.jar
diff --git a/lib/main/android.jar b/v1/lib/main/android.jar
index 1402ae48c..1402ae48c 100644
--- a/lib/main/android.jar
+++ b/v1/lib/main/android.jar
diff --git a/lib/main/commons-codec-1.6.jar b/v1/lib/main/commons-codec-1.6.jar
index ee1bc49ac..ee1bc49ac 100644
--- a/lib/main/commons-codec-1.6.jar
+++ b/v1/lib/main/commons-codec-1.6.jar
diff --git a/lib/main/commons-logging-1.1.1.jar b/v1/lib/main/commons-logging-1.1.1.jar
index 1deef144c..1deef144c 100644
--- a/lib/main/commons-logging-1.1.1.jar
+++ b/v1/lib/main/commons-logging-1.1.1.jar
diff --git a/lib/main/h2-1.2.147.jar b/v1/lib/main/h2-1.2.147.jar
index f93c4a22d..f93c4a22d 100644
--- a/lib/main/h2-1.2.147.jar
+++ b/v1/lib/main/h2-1.2.147.jar
diff --git a/lib/main/httpclient-4.0.3.jar b/v1/lib/main/httpclient-4.0.3.jar
index 16e349a48..16e349a48 100644
--- a/lib/main/httpclient-4.0.3.jar
+++ b/v1/lib/main/httpclient-4.0.3.jar
diff --git a/lib/main/httpcore-4.0.1.jar b/v1/lib/main/httpcore-4.0.1.jar
index 4aef35e2f..4aef35e2f 100644
--- a/lib/main/httpcore-4.0.1.jar
+++ b/v1/lib/main/httpcore-4.0.1.jar
diff --git a/lib/main/javassist-3.14.0-GA.jar b/v1/lib/main/javassist-3.14.0-GA.jar
index 0fbfc3ced..0fbfc3ced 100644
--- a/lib/main/javassist-3.14.0-GA.jar
+++ b/v1/lib/main/javassist-3.14.0-GA.jar
diff --git a/lib/main/json-20080701.jar b/v1/lib/main/json-20080701.jar
index c9a093edb..c9a093edb 100644
--- a/lib/main/json-20080701.jar
+++ b/v1/lib/main/json-20080701.jar
diff --git a/lib/main/maps_v16.jar b/v1/lib/main/maps_v16.jar
index fa96514ce..fa96514ce 100644
--- a/lib/main/maps_v16.jar
+++ b/v1/lib/main/maps_v16.jar
diff --git a/lib/main/opengl-api-gl1.1-android-2.1_r1.jar b/v1/lib/main/opengl-api-gl1.1-android-2.1_r1.jar
index f635aeae8..f635aeae8 100644
--- a/lib/main/opengl-api-gl1.1-android-2.1_r1.jar
+++ b/v1/lib/main/opengl-api-gl1.1-android-2.1_r1.jar
diff --git a/lib/main/sqlite-jdbc-3.7.2.jar b/v1/lib/main/sqlite-jdbc-3.7.2.jar
index 2030ea0f1..2030ea0f1 100644
--- a/lib/main/sqlite-jdbc-3.7.2.jar
+++ b/v1/lib/main/sqlite-jdbc-3.7.2.jar
diff --git a/lib/main/xpp3-1.1.4c.jar b/v1/lib/main/xpp3-1.1.4c.jar
index 451ac82af..451ac82af 100644
--- a/lib/main/xpp3-1.1.4c.jar
+++ b/v1/lib/main/xpp3-1.1.4c.jar
diff --git a/lib/test/mockito-core-1.8.5.jar b/v1/lib/test/mockito-core-1.8.5.jar
index e1f33b406..e1f33b406 100644
--- a/lib/test/mockito-core-1.8.5.jar
+++ b/v1/lib/test/mockito-core-1.8.5.jar
diff --git a/pom.xml b/v1/pom.xml
index eac20bcb7..eac20bcb7 100644
--- a/pom.xml
+++ b/v1/pom.xml
diff --git a/src/main/java/NOTICE b/v1/src/main/java/NOTICE
index 20062013e..20062013e 100644
--- a/src/main/java/NOTICE
+++ b/v1/src/main/java/NOTICE
diff --git a/src/main/java/android/content/TestIntentSender.java b/v1/src/main/java/android/content/TestIntentSender.java
index 40d37dd98..40d37dd98 100644
--- a/src/main/java/android/content/TestIntentSender.java
+++ b/v1/src/main/java/android/content/TestIntentSender.java
diff --git a/src/main/java/android/hardware/TestSensorManager.java b/v1/src/main/java/android/hardware/TestSensorManager.java
index c64f52074..c64f52074 100644
--- a/src/main/java/android/hardware/TestSensorManager.java
+++ b/v1/src/main/java/android/hardware/TestSensorManager.java
diff --git a/src/main/java/android/net/Uri__FromAndroid.java b/v1/src/main/java/android/net/Uri__FromAndroid.java
index 2c77864a4..2c77864a4 100644
--- a/src/main/java/android/net/Uri__FromAndroid.java
+++ b/v1/src/main/java/android/net/Uri__FromAndroid.java
diff --git a/src/main/java/android/os/ShadowAsyncTaskBridge.java b/v1/src/main/java/android/os/ShadowAsyncTaskBridge.java
index 7b553d756..7b553d756 100644
--- a/src/main/java/android/os/ShadowAsyncTaskBridge.java
+++ b/v1/src/main/java/android/os/ShadowAsyncTaskBridge.java
diff --git a/src/main/java/android/os/ShadowBinderBridge.java b/v1/src/main/java/android/os/ShadowBinderBridge.java
index 76ba97a90..76ba97a90 100644
--- a/src/main/java/android/os/ShadowBinderBridge.java
+++ b/v1/src/main/java/android/os/ShadowBinderBridge.java
diff --git a/src/main/java/android/os/TestVibrator.java b/v1/src/main/java/android/os/TestVibrator.java
index ad3326d2a..ad3326d2a 100644
--- a/src/main/java/android/os/TestVibrator.java
+++ b/v1/src/main/java/android/os/TestVibrator.java
diff --git a/src/main/java/android/view/animation/ShadowAnimationBridge.java b/v1/src/main/java/android/view/animation/ShadowAnimationBridge.java
index 3d1edc90b..3d1edc90b 100644
--- a/src/main/java/android/view/animation/ShadowAnimationBridge.java
+++ b/v1/src/main/java/android/view/animation/ShadowAnimationBridge.java
diff --git a/src/main/java/android/webkit/TestWebSettings.java b/v1/src/main/java/android/webkit/TestWebSettings.java
index af57d795f..af57d795f 100644
--- a/src/main/java/android/webkit/TestWebSettings.java
+++ b/v1/src/main/java/android/webkit/TestWebSettings.java
diff --git a/src/main/java/com/foo/Receiver.java b/v1/src/main/java/com/foo/Receiver.java
index c1ed412b3..c1ed412b3 100644
--- a/src/main/java/com/foo/Receiver.java
+++ b/v1/src/main/java/com/foo/Receiver.java
diff --git a/src/main/java/com/google/android/maps/ShadowItemizedOverlayBridge.java b/v1/src/main/java/com/google/android/maps/ShadowItemizedOverlayBridge.java
index a7b70c257..a7b70c257 100644
--- a/src/main/java/com/google/android/maps/ShadowItemizedOverlayBridge.java
+++ b/v1/src/main/java/com/google/android/maps/ShadowItemizedOverlayBridge.java
diff --git a/src/main/java/com/xtremelabs/ConfigTestReceiver.java b/v1/src/main/java/com/xtremelabs/ConfigTestReceiver.java
index 2319678e9..2319678e9 100644
--- a/src/main/java/com/xtremelabs/ConfigTestReceiver.java
+++ b/v1/src/main/java/com/xtremelabs/ConfigTestReceiver.java
diff --git a/src/main/java/com/xtremelabs/robolectric/ApplicationResolver.java b/v1/src/main/java/com/xtremelabs/robolectric/ApplicationResolver.java
index c571a194d..c571a194d 100644
--- a/src/main/java/com/xtremelabs/robolectric/ApplicationResolver.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/ApplicationResolver.java
diff --git a/src/main/java/com/xtremelabs/robolectric/Robolectric.java b/v1/src/main/java/com/xtremelabs/robolectric/Robolectric.java
index 0d420b72d..0d420b72d 100644
--- a/src/main/java/com/xtremelabs/robolectric/Robolectric.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/Robolectric.java
diff --git a/src/main/java/com/xtremelabs/robolectric/RobolectricConfig.java b/v1/src/main/java/com/xtremelabs/robolectric/RobolectricConfig.java
index ccbf71e78..ccbf71e78 100644
--- a/src/main/java/com/xtremelabs/robolectric/RobolectricConfig.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/RobolectricConfig.java
diff --git a/src/main/java/com/xtremelabs/robolectric/RobolectricConfigs.java b/v1/src/main/java/com/xtremelabs/robolectric/RobolectricConfigs.java
index e027d41f2..e027d41f2 100644
--- a/src/main/java/com/xtremelabs/robolectric/RobolectricConfigs.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/RobolectricConfigs.java
diff --git a/src/main/java/com/xtremelabs/robolectric/RobolectricForMaps.java b/v1/src/main/java/com/xtremelabs/robolectric/RobolectricForMaps.java
index 7273657a4..7273657a4 100644
--- a/src/main/java/com/xtremelabs/robolectric/RobolectricForMaps.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/RobolectricForMaps.java
diff --git a/src/main/java/com/xtremelabs/robolectric/RobolectricShadowOfLevel9.java b/v1/src/main/java/com/xtremelabs/robolectric/RobolectricShadowOfLevel9.java
index 65f75c51f..65f75c51f 100644
--- a/src/main/java/com/xtremelabs/robolectric/RobolectricShadowOfLevel9.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/RobolectricShadowOfLevel9.java
diff --git a/src/main/java/com/xtremelabs/robolectric/RobolectricTestRunner.java b/v1/src/main/java/com/xtremelabs/robolectric/RobolectricTestRunner.java
index 50fc33bf5..50fc33bf5 100644
--- a/src/main/java/com/xtremelabs/robolectric/RobolectricTestRunner.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/RobolectricTestRunner.java
diff --git a/src/main/java/com/xtremelabs/robolectric/ShadowScrollView.java b/v1/src/main/java/com/xtremelabs/robolectric/ShadowScrollView.java
index 3c69d0e16..3c69d0e16 100644
--- a/src/main/java/com/xtremelabs/robolectric/ShadowScrollView.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/ShadowScrollView.java
diff --git a/src/main/java/com/xtremelabs/robolectric/annotation/DisableStrictI18n.java b/v1/src/main/java/com/xtremelabs/robolectric/annotation/DisableStrictI18n.java
index ca6c55739..ca6c55739 100644
--- a/src/main/java/com/xtremelabs/robolectric/annotation/DisableStrictI18n.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/annotation/DisableStrictI18n.java
diff --git a/src/main/java/com/xtremelabs/robolectric/annotation/EnableStrictI18n.java b/v1/src/main/java/com/xtremelabs/robolectric/annotation/EnableStrictI18n.java
index f9c21837c..f9c21837c 100644
--- a/src/main/java/com/xtremelabs/robolectric/annotation/EnableStrictI18n.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/annotation/EnableStrictI18n.java
diff --git a/src/main/java/com/xtremelabs/robolectric/annotation/Values.java b/v1/src/main/java/com/xtremelabs/robolectric/annotation/Values.java
index c5923049f..c5923049f 100644
--- a/src/main/java/com/xtremelabs/robolectric/annotation/Values.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/annotation/Values.java
diff --git a/src/main/java/com/xtremelabs/robolectric/bytecode/AndroidTranslator.java b/v1/src/main/java/com/xtremelabs/robolectric/bytecode/AndroidTranslator.java
index e55f76fbc..e55f76fbc 100644
--- a/src/main/java/com/xtremelabs/robolectric/bytecode/AndroidTranslator.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/bytecode/AndroidTranslator.java
diff --git a/src/main/java/com/xtremelabs/robolectric/bytecode/ClassCache.java b/v1/src/main/java/com/xtremelabs/robolectric/bytecode/ClassCache.java
index 323b9670c..323b9670c 100644
--- a/src/main/java/com/xtremelabs/robolectric/bytecode/ClassCache.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/bytecode/ClassCache.java
diff --git a/src/main/java/com/xtremelabs/robolectric/bytecode/ClassHandler.java b/v1/src/main/java/com/xtremelabs/robolectric/bytecode/ClassHandler.java
index e44fc1295..e44fc1295 100644
--- a/src/main/java/com/xtremelabs/robolectric/bytecode/ClassHandler.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/bytecode/ClassHandler.java
diff --git a/src/main/java/com/xtremelabs/robolectric/bytecode/IgnorableClassNotFoundException.java b/v1/src/main/java/com/xtremelabs/robolectric/bytecode/IgnorableClassNotFoundException.java
index c081717a1..c081717a1 100644
--- a/src/main/java/com/xtremelabs/robolectric/bytecode/IgnorableClassNotFoundException.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/bytecode/IgnorableClassNotFoundException.java
diff --git a/src/main/java/com/xtremelabs/robolectric/bytecode/RobolectricClassLoader.java b/v1/src/main/java/com/xtremelabs/robolectric/bytecode/RobolectricClassLoader.java
index 68d9e3c1a..68d9e3c1a 100644
--- a/src/main/java/com/xtremelabs/robolectric/bytecode/RobolectricClassLoader.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/bytecode/RobolectricClassLoader.java
diff --git a/src/main/java/com/xtremelabs/robolectric/bytecode/RobolectricInternals.java b/v1/src/main/java/com/xtremelabs/robolectric/bytecode/RobolectricInternals.java
index ed553cada..ed553cada 100644
--- a/src/main/java/com/xtremelabs/robolectric/bytecode/RobolectricInternals.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/bytecode/RobolectricInternals.java
diff --git a/src/main/java/com/xtremelabs/robolectric/bytecode/ShadowWrangler.java b/v1/src/main/java/com/xtremelabs/robolectric/bytecode/ShadowWrangler.java
index 600edb49d..600edb49d 100644
--- a/src/main/java/com/xtremelabs/robolectric/bytecode/ShadowWrangler.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/bytecode/ShadowWrangler.java
diff --git a/src/main/java/com/xtremelabs/robolectric/bytecode/Type.java b/v1/src/main/java/com/xtremelabs/robolectric/bytecode/Type.java
index a6168b099..a6168b099 100644
--- a/src/main/java/com/xtremelabs/robolectric/bytecode/Type.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/bytecode/Type.java
diff --git a/src/main/java/com/xtremelabs/robolectric/internal/AppSingletonizer.java b/v1/src/main/java/com/xtremelabs/robolectric/internal/AppSingletonizer.java
index 203b22da0..203b22da0 100644
--- a/src/main/java/com/xtremelabs/robolectric/internal/AppSingletonizer.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/internal/AppSingletonizer.java
diff --git a/src/main/java/com/xtremelabs/robolectric/internal/ClassNameResolver.java b/v1/src/main/java/com/xtremelabs/robolectric/internal/ClassNameResolver.java
index 4f2db4ef0..4f2db4ef0 100644
--- a/src/main/java/com/xtremelabs/robolectric/internal/ClassNameResolver.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/internal/ClassNameResolver.java
diff --git a/src/main/java/com/xtremelabs/robolectric/internal/DoNotInstrument.java b/v1/src/main/java/com/xtremelabs/robolectric/internal/DoNotInstrument.java
index 38eaf991c..38eaf991c 100644
--- a/src/main/java/com/xtremelabs/robolectric/internal/DoNotInstrument.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/internal/DoNotInstrument.java
diff --git a/src/main/java/com/xtremelabs/robolectric/internal/EmptyRunnable.java b/v1/src/main/java/com/xtremelabs/robolectric/internal/EmptyRunnable.java
index b58fd66f1..b58fd66f1 100644
--- a/src/main/java/com/xtremelabs/robolectric/internal/EmptyRunnable.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/internal/EmptyRunnable.java
diff --git a/src/main/java/com/xtremelabs/robolectric/internal/Implementation.java b/v1/src/main/java/com/xtremelabs/robolectric/internal/Implementation.java
index 64d0d77b3..64d0d77b3 100644
--- a/src/main/java/com/xtremelabs/robolectric/internal/Implementation.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/internal/Implementation.java
diff --git a/src/main/java/com/xtremelabs/robolectric/internal/Implements.java b/v1/src/main/java/com/xtremelabs/robolectric/internal/Implements.java
index 9fe151e3a..9fe151e3a 100644
--- a/src/main/java/com/xtremelabs/robolectric/internal/Implements.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/internal/Implements.java
diff --git a/src/main/java/com/xtremelabs/robolectric/internal/Instrument.java b/v1/src/main/java/com/xtremelabs/robolectric/internal/Instrument.java
index 2a4031e84..2a4031e84 100644
--- a/src/main/java/com/xtremelabs/robolectric/internal/Instrument.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/internal/Instrument.java
diff --git a/src/main/java/com/xtremelabs/robolectric/internal/RealObject.java b/v1/src/main/java/com/xtremelabs/robolectric/internal/RealObject.java
index e22e5aa1e..e22e5aa1e 100644
--- a/src/main/java/com/xtremelabs/robolectric/internal/RealObject.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/internal/RealObject.java
diff --git a/src/main/java/com/xtremelabs/robolectric/internal/RobolectricTestRunnerInterface.java b/v1/src/main/java/com/xtremelabs/robolectric/internal/RobolectricTestRunnerInterface.java
index d0ea3d5d5..d0ea3d5d5 100644
--- a/src/main/java/com/xtremelabs/robolectric/internal/RobolectricTestRunnerInterface.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/internal/RobolectricTestRunnerInterface.java
diff --git a/src/main/java/com/xtremelabs/robolectric/matchers/CompoundButtonCheckedMatcher.java b/v1/src/main/java/com/xtremelabs/robolectric/matchers/CompoundButtonCheckedMatcher.java
index 9e38010bc..9e38010bc 100644
--- a/src/main/java/com/xtremelabs/robolectric/matchers/CompoundButtonCheckedMatcher.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/matchers/CompoundButtonCheckedMatcher.java
diff --git a/src/main/java/com/xtremelabs/robolectric/matchers/HasCompoundDrawablesMatcher.java b/v1/src/main/java/com/xtremelabs/robolectric/matchers/HasCompoundDrawablesMatcher.java
index 58fb3ef37..58fb3ef37 100644
--- a/src/main/java/com/xtremelabs/robolectric/matchers/HasCompoundDrawablesMatcher.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/matchers/HasCompoundDrawablesMatcher.java
diff --git a/src/main/java/com/xtremelabs/robolectric/matchers/HasResourceMatcher.java b/v1/src/main/java/com/xtremelabs/robolectric/matchers/HasResourceMatcher.java
index 12928e684..12928e684 100644
--- a/src/main/java/com/xtremelabs/robolectric/matchers/HasResourceMatcher.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/matchers/HasResourceMatcher.java
diff --git a/src/main/java/com/xtremelabs/robolectric/matchers/ImageViewHasDrawableMatcher.java b/v1/src/main/java/com/xtremelabs/robolectric/matchers/ImageViewHasDrawableMatcher.java
index 81d17e2f3..81d17e2f3 100644
--- a/src/main/java/com/xtremelabs/robolectric/matchers/ImageViewHasDrawableMatcher.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/matchers/ImageViewHasDrawableMatcher.java
diff --git a/src/main/java/com/xtremelabs/robolectric/matchers/StartedMatcher.java b/v1/src/main/java/com/xtremelabs/robolectric/matchers/StartedMatcher.java
index 569ba9413..569ba9413 100644
--- a/src/main/java/com/xtremelabs/robolectric/matchers/StartedMatcher.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/matchers/StartedMatcher.java
diff --git a/src/main/java/com/xtremelabs/robolectric/matchers/StartedServiceMatcher.java b/v1/src/main/java/com/xtremelabs/robolectric/matchers/StartedServiceMatcher.java
index ce1dfe1ff..ce1dfe1ff 100644
--- a/src/main/java/com/xtremelabs/robolectric/matchers/StartedServiceMatcher.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/matchers/StartedServiceMatcher.java
diff --git a/src/main/java/com/xtremelabs/robolectric/matchers/TextViewHasTextMatcher.java b/v1/src/main/java/com/xtremelabs/robolectric/matchers/TextViewHasTextMatcher.java
index 3fd468ad1..3fd468ad1 100644
--- a/src/main/java/com/xtremelabs/robolectric/matchers/TextViewHasTextMatcher.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/matchers/TextViewHasTextMatcher.java
diff --git a/src/main/java/com/xtremelabs/robolectric/matchers/ViewHasTextMatcher.java b/v1/src/main/java/com/xtremelabs/robolectric/matchers/ViewHasTextMatcher.java
index 6cb1fcd4b..6cb1fcd4b 100644
--- a/src/main/java/com/xtremelabs/robolectric/matchers/ViewHasTextMatcher.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/matchers/ViewHasTextMatcher.java
diff --git a/src/main/java/com/xtremelabs/robolectric/res/AttrResourceLoader.java b/v1/src/main/java/com/xtremelabs/robolectric/res/AttrResourceLoader.java
index 1ec1dd436..1ec1dd436 100644
--- a/src/main/java/com/xtremelabs/robolectric/res/AttrResourceLoader.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/res/AttrResourceLoader.java
diff --git a/src/main/java/com/xtremelabs/robolectric/res/ColorResourceLoader.java b/v1/src/main/java/com/xtremelabs/robolectric/res/ColorResourceLoader.java
index f81046daa..f81046daa 100644
--- a/src/main/java/com/xtremelabs/robolectric/res/ColorResourceLoader.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/res/ColorResourceLoader.java
diff --git a/src/main/java/com/xtremelabs/robolectric/res/DimenResourceLoader.java b/v1/src/main/java/com/xtremelabs/robolectric/res/DimenResourceLoader.java
index 46eeb7d7c..46eeb7d7c 100644
--- a/src/main/java/com/xtremelabs/robolectric/res/DimenResourceLoader.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/res/DimenResourceLoader.java
diff --git a/src/main/java/com/xtremelabs/robolectric/res/DocumentLoader.java b/v1/src/main/java/com/xtremelabs/robolectric/res/DocumentLoader.java
index b4eb1d510..b4eb1d510 100644
--- a/src/main/java/com/xtremelabs/robolectric/res/DocumentLoader.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/res/DocumentLoader.java
diff --git a/src/main/java/com/xtremelabs/robolectric/res/DrawableResourceLoader.java b/v1/src/main/java/com/xtremelabs/robolectric/res/DrawableResourceLoader.java
index bac82e164..bac82e164 100644
--- a/src/main/java/com/xtremelabs/robolectric/res/DrawableResourceLoader.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/res/DrawableResourceLoader.java
diff --git a/src/main/java/com/xtremelabs/robolectric/res/IntegerResourceLoader.java b/v1/src/main/java/com/xtremelabs/robolectric/res/IntegerResourceLoader.java
index 3bc4b24c9..3bc4b24c9 100644
--- a/src/main/java/com/xtremelabs/robolectric/res/IntegerResourceLoader.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/res/IntegerResourceLoader.java
diff --git a/src/main/java/com/xtremelabs/robolectric/res/MenuLoader.java b/v1/src/main/java/com/xtremelabs/robolectric/res/MenuLoader.java
index 8f2ba007b..8f2ba007b 100644
--- a/src/main/java/com/xtremelabs/robolectric/res/MenuLoader.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/res/MenuLoader.java
diff --git a/src/main/java/com/xtremelabs/robolectric/res/PluralResourceLoader.java b/v1/src/main/java/com/xtremelabs/robolectric/res/PluralResourceLoader.java
index 6b4ec85f1..6b4ec85f1 100644
--- a/src/main/java/com/xtremelabs/robolectric/res/PluralResourceLoader.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/res/PluralResourceLoader.java
diff --git a/src/main/java/com/xtremelabs/robolectric/res/PreferenceLoader.java b/v1/src/main/java/com/xtremelabs/robolectric/res/PreferenceLoader.java
index 1d80ae490..1d80ae490 100644
--- a/src/main/java/com/xtremelabs/robolectric/res/PreferenceLoader.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/res/PreferenceLoader.java
diff --git a/src/main/java/com/xtremelabs/robolectric/res/RawResourceLoader.java b/v1/src/main/java/com/xtremelabs/robolectric/res/RawResourceLoader.java
index da70f81d3..da70f81d3 100644
--- a/src/main/java/com/xtremelabs/robolectric/res/RawResourceLoader.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/res/RawResourceLoader.java
diff --git a/src/main/java/com/xtremelabs/robolectric/res/ResourceExtractor.java b/v1/src/main/java/com/xtremelabs/robolectric/res/ResourceExtractor.java
index 71efc494d..71efc494d 100644
--- a/src/main/java/com/xtremelabs/robolectric/res/ResourceExtractor.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/res/ResourceExtractor.java
diff --git a/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java b/v1/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
index 3e60961d7..3e60961d7 100644
--- a/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
diff --git a/src/main/java/com/xtremelabs/robolectric/res/ResourceReferenceResolver.java b/v1/src/main/java/com/xtremelabs/robolectric/res/ResourceReferenceResolver.java
index 697eb7716..697eb7716 100644
--- a/src/main/java/com/xtremelabs/robolectric/res/ResourceReferenceResolver.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/res/ResourceReferenceResolver.java
diff --git a/src/main/java/com/xtremelabs/robolectric/res/ResourceValueConverter.java b/v1/src/main/java/com/xtremelabs/robolectric/res/ResourceValueConverter.java
index 1e1f3ce6e..1e1f3ce6e 100644
--- a/src/main/java/com/xtremelabs/robolectric/res/ResourceValueConverter.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/res/ResourceValueConverter.java
diff --git a/src/main/java/com/xtremelabs/robolectric/res/RobolectricPackageManager.java b/v1/src/main/java/com/xtremelabs/robolectric/res/RobolectricPackageManager.java
index 730dc3dbe..730dc3dbe 100644
--- a/src/main/java/com/xtremelabs/robolectric/res/RobolectricPackageManager.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/res/RobolectricPackageManager.java
diff --git a/src/main/java/com/xtremelabs/robolectric/res/StringArrayResourceLoader.java b/v1/src/main/java/com/xtremelabs/robolectric/res/StringArrayResourceLoader.java
index 1a3988c52..1a3988c52 100644
--- a/src/main/java/com/xtremelabs/robolectric/res/StringArrayResourceLoader.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/res/StringArrayResourceLoader.java
diff --git a/src/main/java/com/xtremelabs/robolectric/res/StringResourceLoader.java b/v1/src/main/java/com/xtremelabs/robolectric/res/StringResourceLoader.java
index 88058ebb1..88058ebb1 100644
--- a/src/main/java/com/xtremelabs/robolectric/res/StringResourceLoader.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/res/StringResourceLoader.java
diff --git a/src/main/java/com/xtremelabs/robolectric/res/ViewLoader.java b/v1/src/main/java/com/xtremelabs/robolectric/res/ViewLoader.java
index 2b54c680f..2b54c680f 100644
--- a/src/main/java/com/xtremelabs/robolectric/res/ViewLoader.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/res/ViewLoader.java
diff --git a/src/main/java/com/xtremelabs/robolectric/res/XTagXmlResourceLoader.java b/v1/src/main/java/com/xtremelabs/robolectric/res/XTagXmlResourceLoader.java
index fa068b3fb..fa068b3fb 100644
--- a/src/main/java/com/xtremelabs/robolectric/res/XTagXmlResourceLoader.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/res/XTagXmlResourceLoader.java
diff --git a/src/main/java/com/xtremelabs/robolectric/res/XmlLoader.java b/v1/src/main/java/com/xtremelabs/robolectric/res/XmlLoader.java
index 32a8c3105..32a8c3105 100644
--- a/src/main/java/com/xtremelabs/robolectric/res/XmlLoader.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/res/XmlLoader.java
diff --git a/src/main/java/com/xtremelabs/robolectric/res/XpathResourceXmlLoader.java b/v1/src/main/java/com/xtremelabs/robolectric/res/XpathResourceXmlLoader.java
index 985779d7f..985779d7f 100644
--- a/src/main/java/com/xtremelabs/robolectric/res/XpathResourceXmlLoader.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/res/XpathResourceXmlLoader.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/HttpResponseGenerator.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/HttpResponseGenerator.java
index 70f4b5435..70f4b5435 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/HttpResponseGenerator.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/HttpResponseGenerator.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/SerializedFragmentState.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/SerializedFragmentState.java
index 1cf9c0024..1cf9c0024 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/SerializedFragmentState.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/SerializedFragmentState.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAbsListView.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAbsListView.java
index 5ee3c55ac..5ee3c55ac 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAbsListView.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAbsListView.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAbsSeekBar.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAbsSeekBar.java
index e90f983e3..e90f983e3 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAbsSeekBar.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAbsSeekBar.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAbsSpinner.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAbsSpinner.java
index 80c73fe10..80c73fe10 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAbsSpinner.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAbsSpinner.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAbsoluteLayout.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAbsoluteLayout.java
index 9460425a5..9460425a5 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAbsoluteLayout.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAbsoluteLayout.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAbstractCursor.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAbstractCursor.java
index 11e859715..11e859715 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAbstractCursor.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAbstractCursor.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAccount.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAccount.java
index 37bd4a4c2..37bd4a4c2 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAccount.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAccount.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAccountManager.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAccountManager.java
index e2a0f24e5..e2a0f24e5 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAccountManager.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAccountManager.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowActivity.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowActivity.java
index d3162159e..d3162159e 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowActivity.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowActivity.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowActivityGroup.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowActivityGroup.java
index 16ccce62b..16ccce62b 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowActivityGroup.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowActivityGroup.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowActivityInfo.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowActivityInfo.java
index 3f96ac5c2..3f96ac5c2 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowActivityInfo.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowActivityInfo.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowActivityManager.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowActivityManager.java
index 059139f53..059139f53 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowActivityManager.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowActivityManager.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAdapterView.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAdapterView.java
index 7c3b13f77..7c3b13f77 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAdapterView.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAdapterView.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAddress.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAddress.java
index 449384fe1..449384fe1 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAddress.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAddress.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAlarmManager.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAlarmManager.java
index 3fef768ed..3fef768ed 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAlarmManager.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAlarmManager.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAlertDialog.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAlertDialog.java
index 53f20f67f..53f20f67f 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAlertDialog.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAlertDialog.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAlphaAnimation.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAlphaAnimation.java
index d3648f1d2..d3648f1d2 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAlphaAnimation.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAlphaAnimation.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAndroidHttpClient.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAndroidHttpClient.java
index 184896ab3..184896ab3 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAndroidHttpClient.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAndroidHttpClient.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAnimation.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAnimation.java
index ac4f045c7..ac4f045c7 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAnimation.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAnimation.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAnimationDrawable.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAnimationDrawable.java
index 9697c0cb7..9697c0cb7 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAnimationDrawable.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAnimationDrawable.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAnimationSet.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAnimationSet.java
index 5160bf8eb..5160bf8eb 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAnimationSet.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAnimationSet.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAnimationUtils.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAnimationUtils.java
index 3e880857b..3e880857b 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAnimationUtils.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAnimationUtils.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAppWidgetManager.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAppWidgetManager.java
index e7e49a46a..e7e49a46a 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAppWidgetManager.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAppWidgetManager.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowApplication.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowApplication.java
index 1b1aa8e7d..1b1aa8e7d 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowApplication.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowApplication.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowArrayAdapter.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowArrayAdapter.java
index 7990df4b0..7990df4b0 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowArrayAdapter.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowArrayAdapter.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAssetManager.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAssetManager.java
index 74dd2a2e9..74dd2a2e9 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAssetManager.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAssetManager.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAsyncTask.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAsyncTask.java
index 57736e662..57736e662 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAsyncTask.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAsyncTask.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAudioManager.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAudioManager.java
index 5f3de9221..5f3de9221 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAudioManager.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAudioManager.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAutoCompleteTextView.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAutoCompleteTextView.java
index 3c0362b21..3c0362b21 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAutoCompleteTextView.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowAutoCompleteTextView.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBase64.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBase64.java
index a8ed36076..a8ed36076 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBase64.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBase64.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBaseAdapter.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBaseAdapter.java
index 98c3f82a7..98c3f82a7 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBaseAdapter.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBaseAdapter.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBinder.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBinder.java
index 0499e52ca..0499e52ca 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBinder.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBinder.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBitmap.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBitmap.java
index 20e7553cc..20e7553cc 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBitmap.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBitmap.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBitmapDrawable.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBitmapDrawable.java
index da4c4e16f..da4c4e16f 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBitmapDrawable.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBitmapDrawable.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBitmapFactory.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBitmapFactory.java
index f804eb113..f804eb113 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBitmapFactory.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBitmapFactory.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBluetoothAdapter.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBluetoothAdapter.java
index e15a0fdfd..e15a0fdfd 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBluetoothAdapter.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBluetoothAdapter.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBluetoothDevice.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBluetoothDevice.java
index de7068c5f..de7068c5f 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBluetoothDevice.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBluetoothDevice.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBundle.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBundle.java
index 02ddf898f..02ddf898f 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBundle.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBundle.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowButton.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowButton.java
index cefe303f2..cefe303f2 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowButton.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowButton.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCamera.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCamera.java
index 16248a2ba..16248a2ba 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCamera.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCamera.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCameraParameters.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCameraParameters.java
index 4ed4437e8..4ed4437e8 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCameraParameters.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCameraParameters.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCameraSize.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCameraSize.java
index 43f4aaf38..43f4aaf38 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCameraSize.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCameraSize.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCanvas.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCanvas.java
index e67515fb7..e67515fb7 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCanvas.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCanvas.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCheckedTextView.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCheckedTextView.java
index 2fc8141ca..2fc8141ca 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCheckedTextView.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCheckedTextView.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowClipboardManager.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowClipboardManager.java
index de204fc25..de204fc25 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowClipboardManager.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowClipboardManager.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowColor.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowColor.java
index 5ca4375a4..5ca4375a4 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowColor.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowColor.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowColorDrawable.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowColorDrawable.java
index 200d51d43..200d51d43 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowColorDrawable.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowColorDrawable.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowColorMatrix.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowColorMatrix.java
index 2d8db51b9..2d8db51b9 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowColorMatrix.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowColorMatrix.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowColorMatrixColorFilter.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowColorMatrixColorFilter.java
index 2090dca84..2090dca84 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowColorMatrixColorFilter.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowColorMatrixColorFilter.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowColorStateList.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowColorStateList.java
index 012c45738..012c45738 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowColorStateList.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowColorStateList.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowComponentName.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowComponentName.java
index 882766c3a..882766c3a 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowComponentName.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowComponentName.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCompoundButton.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCompoundButton.java
index e00dca55b..e00dca55b 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCompoundButton.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCompoundButton.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowConfiguration.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowConfiguration.java
index e94e2e7b2..e94e2e7b2 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowConfiguration.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowConfiguration.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowConnectivityManager.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowConnectivityManager.java
index f3c1548a0..f3c1548a0 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowConnectivityManager.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowConnectivityManager.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentProvider.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentProvider.java
index 700fbae3e..700fbae3e 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentProvider.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentProvider.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentProviderOperation.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentProviderOperation.java
index 73cee46bc..73cee46bc 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentProviderOperation.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentProviderOperation.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentProviderOperationBuilder.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentProviderOperationBuilder.java
index 2f69a8cd9..2f69a8cd9 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentProviderOperationBuilder.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentProviderOperationBuilder.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentProviderResult.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentProviderResult.java
index cf9e9236c..cf9e9236c 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentProviderResult.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentProviderResult.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentResolver.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentResolver.java
index 8c5e4bde2..8c5e4bde2 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentResolver.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentResolver.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentUris.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentUris.java
index fce641ed7..fce641ed7 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentUris.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentUris.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentValues.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentValues.java
index 0c2bf1c05..0c2bf1c05 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentValues.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentValues.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContext.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContext.java
index 23a978903..23a978903 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContext.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContext.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContextThemeWrapper.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContextThemeWrapper.java
index 28ae8a489..28ae8a489 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContextThemeWrapper.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContextThemeWrapper.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContextWrapper.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContextWrapper.java
index 9724e6b41..9724e6b41 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContextWrapper.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowContextWrapper.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCookieManager.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCookieManager.java
index 0a0c24a9a..0a0c24a9a 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCookieManager.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCookieManager.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCookieSyncManager.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCookieSyncManager.java
index 2c910c2e3..2c910c2e3 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCookieSyncManager.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCookieSyncManager.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCountDownTimer.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCountDownTimer.java
index 62ac448d5..62ac448d5 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCountDownTimer.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCountDownTimer.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCriteria.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCriteria.java
index 0a2ffa4d9..0a2ffa4d9 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCriteria.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCriteria.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCursorAdapter.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCursorAdapter.java
index 20714071a..20714071a 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCursorAdapter.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCursorAdapter.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCursorLoader.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCursorLoader.java
index 8b2d94f07..8b2d94f07 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCursorLoader.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCursorLoader.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCursorWrapper.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCursorWrapper.java
index 9456c6bb3..9456c6bb3 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCursorWrapper.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCursorWrapper.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDatabaseUtils.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDatabaseUtils.java
index cdff98845..cdff98845 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDatabaseUtils.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDatabaseUtils.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDateFormat.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDateFormat.java
index 7a5a42ec2..7a5a42ec2 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDateFormat.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDateFormat.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDefaultRequestDirector.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDefaultRequestDirector.java
index d377e9a93..d377e9a93 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDefaultRequestDirector.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDefaultRequestDirector.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDialog.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDialog.java
index 0f317a290..0f317a290 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDialog.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDialog.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDialogFragment.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDialogFragment.java
index 11538a2a5..11538a2a5 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDialogFragment.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDialogFragment.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDialogPreference.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDialogPreference.java
index 50145ae53..50145ae53 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDialogPreference.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDialogPreference.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDisplay.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDisplay.java
index fe0914fcb..fe0914fcb 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDisplay.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDisplay.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDrawable.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDrawable.java
index b5d791283..b5d791283 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDrawable.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowDrawable.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowEditText.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowEditText.java
index 50cf45528..50cf45528 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowEditText.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowEditText.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowEnvironment.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowEnvironment.java
index 27d49b7ab..27d49b7ab 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowEnvironment.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowEnvironment.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowExpandableListView.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowExpandableListView.java
index 5de3bac92..5de3bac92 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowExpandableListView.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowExpandableListView.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowFilter.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowFilter.java
index 6076f59fd..6076f59fd 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowFilter.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowFilter.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowFloatMath.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowFloatMath.java
index 2a4f6b2f9..2a4f6b2f9 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowFloatMath.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowFloatMath.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowFragment.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowFragment.java
index 22c0aed87..22c0aed87 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowFragment.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowFragment.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowFragmentActivity.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowFragmentActivity.java
index 98172b7f7..98172b7f7 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowFragmentActivity.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowFragmentActivity.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowFragmentPagerAdapter.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowFragmentPagerAdapter.java
index d919ba502..d919ba502 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowFragmentPagerAdapter.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowFragmentPagerAdapter.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowFrameLayout.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowFrameLayout.java
index d96ca345f..d96ca345f 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowFrameLayout.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowFrameLayout.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowGallery.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowGallery.java
index 43dbcebda..43dbcebda 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowGallery.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowGallery.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowGeoPoint.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowGeoPoint.java
index 03652b453..03652b453 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowGeoPoint.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowGeoPoint.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowGeocoder.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowGeocoder.java
index bbc6bb064..bbc6bb064 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowGeocoder.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowGeocoder.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowGridView.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowGridView.java
index e69a19b35..e69a19b35 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowGridView.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowGridView.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowHandler.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowHandler.java
index 51265f36c..51265f36c 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowHandler.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowHandler.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowHandlerThread.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowHandlerThread.java
index 1bcfa0fce..1bcfa0fce 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowHandlerThread.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowHandlerThread.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowHtml.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowHtml.java
index a89641f9e..a89641f9e 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowHtml.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowHtml.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowImageView.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowImageView.java
index 9963cdf7b..9963cdf7b 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowImageView.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowImageView.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowInputMethodManager.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowInputMethodManager.java
index 16546dcb7..16546dcb7 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowInputMethodManager.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowInputMethodManager.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowIntent.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowIntent.java
index 56d198ebd..56d198ebd 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowIntent.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowIntent.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowIntentFilter.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowIntentFilter.java
index fe8519819..fe8519819 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowIntentFilter.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowIntentFilter.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowIntentFilterAuthorityEntry.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowIntentFilterAuthorityEntry.java
index 5ebb4c1e3..5ebb4c1e3 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowIntentFilterAuthorityEntry.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowIntentFilterAuthorityEntry.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowItemizedOverlay.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowItemizedOverlay.java
index 5c845fbe5..5c845fbe5 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowItemizedOverlay.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowItemizedOverlay.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowJsPromptResult.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowJsPromptResult.java
index dfdf43879..dfdf43879 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowJsPromptResult.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowJsPromptResult.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowJsResult.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowJsResult.java
index 88868dcfa..88868dcfa 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowJsResult.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowJsResult.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowKeyEvent.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowKeyEvent.java
index bc83e6f3f..bc83e6f3f 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowKeyEvent.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowKeyEvent.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowKeyGuardLock.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowKeyGuardLock.java
index 0df3a336a..0df3a336a 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowKeyGuardLock.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowKeyGuardLock.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowKeyguardManager.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowKeyguardManager.java
index ac350de8c..ac350de8c 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowKeyguardManager.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowKeyguardManager.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLayerDrawable.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLayerDrawable.java
index d5bde0907..d5bde0907 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLayerDrawable.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLayerDrawable.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLayoutInflater.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLayoutInflater.java
index b15844194..b15844194 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLayoutInflater.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLayoutInflater.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLayoutParams.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLayoutParams.java
index 88ee85aab..88ee85aab 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLayoutParams.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLayoutParams.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLinearLayout.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLinearLayout.java
index 2a4ab572d..2a4ab572d 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLinearLayout.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLinearLayout.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLinkMovementMethod.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLinkMovementMethod.java
index eea2223c2..eea2223c2 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLinkMovementMethod.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLinkMovementMethod.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowListActivity.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowListActivity.java
index f57ab6ec4..f57ab6ec4 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowListActivity.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowListActivity.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowListFragment.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowListFragment.java
index d5a8d9a1e..d5a8d9a1e 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowListFragment.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowListFragment.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowListPreference.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowListPreference.java
index b324e8554..b324e8554 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowListPreference.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowListPreference.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowListView.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowListView.java
index d591e2fdf..d591e2fdf 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowListView.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowListView.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLocalBroadcastManager.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLocalBroadcastManager.java
index 668d9b001..668d9b001 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLocalBroadcastManager.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLocalBroadcastManager.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLocation.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLocation.java
index 07a48126c..07a48126c 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLocation.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLocation.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLocationManager.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLocationManager.java
index 4c4fdf509..4c4fdf509 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLocationManager.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLocationManager.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLog.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLog.java
index 0e49bf9cb..0e49bf9cb 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLog.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLog.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLooper.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLooper.java
index 99126e2f3..99126e2f3 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLooper.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowLooper.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMapActivity.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMapActivity.java
index 1baa7ff56..1baa7ff56 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMapActivity.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMapActivity.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMapController.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMapController.java
index fac5f9f53..fac5f9f53 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMapController.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMapController.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMapView.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMapView.java
index b9e3458ed..b9e3458ed 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMapView.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMapView.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMarginLayoutParams.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMarginLayoutParams.java
index 760456058..760456058 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMarginLayoutParams.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMarginLayoutParams.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMatrix.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMatrix.java
index baf76c270..baf76c270 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMatrix.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMatrix.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMatrixCursor.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMatrixCursor.java
index 870b96cc1..870b96cc1 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMatrixCursor.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMatrixCursor.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMediaPlayer.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMediaPlayer.java
index e33a17b71..e33a17b71 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMediaPlayer.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMediaPlayer.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMediaRecorder.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMediaRecorder.java
index 95884c886..95884c886 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMediaRecorder.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMediaRecorder.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMediaStore.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMediaStore.java
index a0c93f52b..a0c93f52b 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMediaStore.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMediaStore.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMenuInflater.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMenuInflater.java
index c39c45aba..c39c45aba 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMenuInflater.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMenuInflater.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMessage.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMessage.java
index d1588c023..d1588c023 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMessage.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMessage.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMessenger.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMessenger.java
index eb22e46f3..eb22e46f3 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMessenger.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMessenger.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMimeTypeMap.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMimeTypeMap.java
index c344b6616..c344b6616 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMimeTypeMap.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMimeTypeMap.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMotionEvent.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMotionEvent.java
index c9a71875a..c9a71875a 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMotionEvent.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowMotionEvent.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNdefMessage.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNdefMessage.java
index d3a0cff80..d3a0cff80 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNdefMessage.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNdefMessage.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNdefRecord.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNdefRecord.java
index 60eec86e4..60eec86e4 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNdefRecord.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNdefRecord.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNetworkInfo.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNetworkInfo.java
index 7446b970e..7446b970e 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNetworkInfo.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNetworkInfo.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNfcAdapter.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNfcAdapter.java
index 6ff7a524c..6ff7a524c 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNfcAdapter.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNfcAdapter.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNotification.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNotification.java
index 75bc06f86..75bc06f86 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNotification.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNotification.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNotificationManager.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNotificationManager.java
index e06065f9b..e06065f9b 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNotificationManager.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowNotificationManager.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowOverlayItem.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowOverlayItem.java
index 9e7edc0bd..9e7edc0bd 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowOverlayItem.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowOverlayItem.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPagerAdapter.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPagerAdapter.java
index 949d2c29d..949d2c29d 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPagerAdapter.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPagerAdapter.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPaint.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPaint.java
index f7c29cfb3..f7c29cfb3 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPaint.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPaint.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPair.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPair.java
index a477fa95a..a477fa95a 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPair.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPair.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowParcel.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowParcel.java
index a6e7bbbcb..a6e7bbbcb 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowParcel.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowParcel.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPasswordTransformationMethod.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPasswordTransformationMethod.java
index 69235d577..69235d577 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPasswordTransformationMethod.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPasswordTransformationMethod.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPath.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPath.java
index 3e382565b..3e382565b 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPath.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPath.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPatterns.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPatterns.java
index 45971eadd..45971eadd 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPatterns.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPatterns.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPendingIntent.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPendingIntent.java
index 3df65a7d6..3df65a7d6 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPendingIntent.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPendingIntent.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPeriodicSync.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPeriodicSync.java
index 2bcd5b059..2bcd5b059 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPeriodicSync.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPeriodicSync.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPhoneNumberUtils.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPhoneNumberUtils.java
index 5cfc5f9ad..5cfc5f9ad 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPhoneNumberUtils.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPhoneNumberUtils.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPoint.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPoint.java
index 7c265939d..7c265939d 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPoint.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPoint.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPointF.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPointF.java
index 38dd7416f..38dd7416f 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPointF.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPointF.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPopupWindow.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPopupWindow.java
index b3c378414..b3c378414 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPopupWindow.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPopupWindow.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPowerManager.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPowerManager.java
index cc72a7f38..cc72a7f38 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPowerManager.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPowerManager.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreference.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreference.java
index b68e50e35..b68e50e35 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreference.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreference.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreferenceActivity.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreferenceActivity.java
index 44bd0cf59..44bd0cf59 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreferenceActivity.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreferenceActivity.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreferenceCategory.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreferenceCategory.java
index e1bc8f425..e1bc8f425 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreferenceCategory.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreferenceCategory.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreferenceGroup.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreferenceGroup.java
index 90664ec2f..90664ec2f 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreferenceGroup.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreferenceGroup.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreferenceManager.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreferenceManager.java
index 21e2aed03..21e2aed03 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreferenceManager.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreferenceManager.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreferenceScreen.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreferenceScreen.java
index 4cbefdd7e..4cbefdd7e 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreferenceScreen.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreferenceScreen.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowProcess.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowProcess.java
index be0cf7785..be0cf7785 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowProcess.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowProcess.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowProgressBar.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowProgressBar.java
index b1783017b..b1783017b 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowProgressBar.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowProgressBar.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowProgressDialog.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowProgressDialog.java
index 243ebbb6f..243ebbb6f 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowProgressDialog.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowProgressDialog.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowRadioButton.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowRadioButton.java
index c83f15cb9..c83f15cb9 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowRadioButton.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowRadioButton.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowRadioGroup.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowRadioGroup.java
index 31e36885b..31e36885b 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowRadioGroup.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowRadioGroup.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowRatingBar.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowRatingBar.java
index 54e1c34eb..54e1c34eb 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowRatingBar.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowRatingBar.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowRect.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowRect.java
index 3573aafd0..3573aafd0 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowRect.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowRect.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowRemoteCallbackList.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowRemoteCallbackList.java
index b2fcee90d..b2fcee90d 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowRemoteCallbackList.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowRemoteCallbackList.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowRemoteViews.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowRemoteViews.java
index 8cfe38b47..8cfe38b47 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowRemoteViews.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowRemoteViews.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowResolveInfo.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowResolveInfo.java
index 1ef9033ad..1ef9033ad 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowResolveInfo.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowResolveInfo.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowResourceCursorAdapter.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowResourceCursorAdapter.java
index 4402e758f..4402e758f 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowResourceCursorAdapter.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowResourceCursorAdapter.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowResources.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowResources.java
index 12e6ea13b..12e6ea13b 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowResources.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowResources.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowResultReceiver.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowResultReceiver.java
index 78e055c4c..78e055c4c 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowResultReceiver.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowResultReceiver.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteCloseable.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteCloseable.java
index 52a0df5bd..52a0df5bd 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteCloseable.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteCloseable.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteCursor.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteCursor.java
index 84431491e..84431491e 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteCursor.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteCursor.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteDatabase.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteDatabase.java
index 44755043b..44755043b 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteDatabase.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteDatabase.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteOpenHelper.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteOpenHelper.java
index cbcdda093..cbcdda093 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteOpenHelper.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteOpenHelper.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteProgram.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteProgram.java
index d903bfe13..d903bfe13 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteProgram.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteProgram.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteQueryBuilder.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteQueryBuilder.java
index 5881b1b05..5881b1b05 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteQueryBuilder.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteQueryBuilder.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteStatement.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteStatement.java
index 2bbdce66e..2bbdce66e 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteStatement.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSQLiteStatement.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSSLCertificateSocketFactory.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSSLCertificateSocketFactory.java
index f69c3bc71..f69c3bc71 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSSLCertificateSocketFactory.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSSLCertificateSocketFactory.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowScanResult.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowScanResult.java
index 31b66912d..31b66912d 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowScanResult.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowScanResult.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSeekBar.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSeekBar.java
index 31f368409..31f368409 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSeekBar.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSeekBar.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSensorManager.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSensorManager.java
index 99bba883a..99bba883a 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSensorManager.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSensorManager.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowService.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowService.java
index 74a9cc1ca..74a9cc1ca 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowService.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowService.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSettings.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSettings.java
index f8787eacd..f8787eacd 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSettings.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSettings.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowShapeDrawable.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowShapeDrawable.java
index d7a8e3c01..d7a8e3c01 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowShapeDrawable.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowShapeDrawable.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSignature.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSignature.java
index b643c1728..b643c1728 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSignature.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSignature.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSimpleCursorAdapter.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSimpleCursorAdapter.java
index 29c9322a7..29c9322a7 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSimpleCursorAdapter.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSimpleCursorAdapter.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSmsManager.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSmsManager.java
index 3c4cca763..3c4cca763 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSmsManager.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSmsManager.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSpannableString.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSpannableString.java
index 5f1bafb24..5f1bafb24 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSpannableString.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSpannableString.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSpannableStringBuilder.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSpannableStringBuilder.java
index 89d631a6b..89d631a6b 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSpannableStringBuilder.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSpannableStringBuilder.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSparseArray.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSparseArray.java
index d46b3b77a..d46b3b77a 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSparseArray.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSparseArray.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSparseBooleanArray.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSparseBooleanArray.java
index dfe148425..dfe148425 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSparseBooleanArray.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSparseBooleanArray.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSparseIntArray.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSparseIntArray.java
index fe7c8d185..fe7c8d185 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSparseIntArray.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSparseIntArray.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSpinner.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSpinner.java
index 08037d322..08037d322 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSpinner.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSpinner.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSslErrorHandler.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSslErrorHandler.java
index f24db96d5..f24db96d5 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSslErrorHandler.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSslErrorHandler.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowStatFs.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowStatFs.java
index bea724ef0..bea724ef0 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowStatFs.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowStatFs.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowStateListDrawable.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowStateListDrawable.java
index 8922af8f6..8922af8f6 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowStateListDrawable.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowStateListDrawable.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSurfaceView.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSurfaceView.java
index 217e48ba1..217e48ba1 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSurfaceView.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSurfaceView.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSyncResult.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSyncResult.java
index 758af75e3..758af75e3 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSyncResult.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSyncResult.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTabActivity.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTabActivity.java
index 18ac47538..18ac47538 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTabActivity.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTabActivity.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTabHost.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTabHost.java
index 1d7671f90..1d7671f90 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTabHost.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTabHost.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTabSpec.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTabSpec.java
index 06d27fe92..06d27fe92 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTabSpec.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTabSpec.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTelephonyManager.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTelephonyManager.java
index a4899a4fa..a4899a4fa 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTelephonyManager.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTelephonyManager.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTextPaint.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTextPaint.java
index 2364adc42..2364adc42 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTextPaint.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTextPaint.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTextUtils.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTextUtils.java
index abf5491fd..abf5491fd 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTextUtils.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTextUtils.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTextView.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTextView.java
index 3027fcc4a..3027fcc4a 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTextView.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTextView.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTime.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTime.java
index c8bbaf260..c8bbaf260 100755
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTime.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTime.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowToast.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowToast.java
index f0bf9d484..f0bf9d484 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowToast.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowToast.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTranslateAnimation.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTranslateAnimation.java
index f0beafe03..f0beafe03 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTranslateAnimation.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTranslateAnimation.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTypedArray.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTypedArray.java
index 48731482a..48731482a 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTypedArray.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTypedArray.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTypedValue.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTypedValue.java
index 512706c44..512706c44 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTypedValue.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTypedValue.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowURLSpan.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowURLSpan.java
index b4519f5c8..b4519f5c8 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowURLSpan.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowURLSpan.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowUriMatcher.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowUriMatcher.java
index 0e16db0a3..0e16db0a3 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowUriMatcher.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowUriMatcher.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowVibrator.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowVibrator.java
index 2120379f9..2120379f9 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowVibrator.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowVibrator.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowVideoView.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowVideoView.java
index 2ff11329d..2ff11329d 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowVideoView.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowVideoView.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowView.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowView.java
index c5aa97254..c5aa97254 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowView.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowView.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewAnimator.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewAnimator.java
index 52a56d3b8..52a56d3b8 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewAnimator.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewAnimator.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewConfiguration.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewConfiguration.java
index e2df35485..e2df35485 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewConfiguration.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewConfiguration.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewFlipper.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewFlipper.java
index 722ec4798..722ec4798 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewFlipper.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewFlipper.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewGroup.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewGroup.java
index bc998d960..bc998d960 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewGroup.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewGroup.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewMeasureSpec.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewMeasureSpec.java
index ed225e71e..ed225e71e 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewMeasureSpec.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewMeasureSpec.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewPager.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewPager.java
index 87a54768c..87a54768c 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewPager.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewPager.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewStub.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewStub.java
index 49a836f00..49a836f00 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewStub.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewStub.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewTreeObserver.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewTreeObserver.java
index f7c4fd5c4..f7c4fd5c4 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewTreeObserver.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowViewTreeObserver.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWebView.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWebView.java
index d9b3caf9f..d9b3caf9f 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWebView.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWebView.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWifiConfiguration.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWifiConfiguration.java
index 1258fd6c1..1258fd6c1 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWifiConfiguration.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWifiConfiguration.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWifiInfo.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWifiInfo.java
index 943ab5831..943ab5831 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWifiInfo.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWifiInfo.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWifiManager.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWifiManager.java
index 95fbdde53..95fbdde53 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWifiManager.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWifiManager.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWindow.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWindow.java
index 28f976e6a..28f976e6a 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWindow.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWindow.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowZoomButtonsController.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowZoomButtonsController.java
index 44305d959..44305d959 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowZoomButtonsController.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/ShadowZoomButtonsController.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/StatusLineStub.java b/v1/src/main/java/com/xtremelabs/robolectric/shadows/StatusLineStub.java
index bf329508a..bf329508a 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/StatusLineStub.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/StatusLineStub.java
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/package.html b/v1/src/main/java/com/xtremelabs/robolectric/shadows/package.html
index 828a516f6..828a516f6 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/package.html
+++ b/v1/src/main/java/com/xtremelabs/robolectric/shadows/package.html
diff --git a/src/main/java/com/xtremelabs/robolectric/test/ConfigTestReceiver.java b/v1/src/main/java/com/xtremelabs/robolectric/test/ConfigTestReceiver.java
index 3ba8be575..3ba8be575 100644
--- a/src/main/java/com/xtremelabs/robolectric/test/ConfigTestReceiver.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/test/ConfigTestReceiver.java
diff --git a/src/main/java/com/xtremelabs/robolectric/tester/android/content/TestSharedPreferences.java b/v1/src/main/java/com/xtremelabs/robolectric/tester/android/content/TestSharedPreferences.java
index 21f2e3ade..21f2e3ade 100644
--- a/src/main/java/com/xtremelabs/robolectric/tester/android/content/TestSharedPreferences.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/tester/android/content/TestSharedPreferences.java
diff --git a/src/main/java/com/xtremelabs/robolectric/tester/android/content/pm/StubPackageManager.java b/v1/src/main/java/com/xtremelabs/robolectric/tester/android/content/pm/StubPackageManager.java
index a4aca006d..a4aca006d 100644
--- a/src/main/java/com/xtremelabs/robolectric/tester/android/content/pm/StubPackageManager.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/tester/android/content/pm/StubPackageManager.java
diff --git a/src/main/java/com/xtremelabs/robolectric/tester/android/database/SimpleTestCursor.java b/v1/src/main/java/com/xtremelabs/robolectric/tester/android/database/SimpleTestCursor.java
index 9c72320ec..9c72320ec 100644
--- a/src/main/java/com/xtremelabs/robolectric/tester/android/database/SimpleTestCursor.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/tester/android/database/SimpleTestCursor.java
diff --git a/src/main/java/com/xtremelabs/robolectric/tester/android/database/TestCursor.java b/v1/src/main/java/com/xtremelabs/robolectric/tester/android/database/TestCursor.java
index 84a3d85b1..84a3d85b1 100644
--- a/src/main/java/com/xtremelabs/robolectric/tester/android/database/TestCursor.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/tester/android/database/TestCursor.java
diff --git a/src/main/java/com/xtremelabs/robolectric/tester/android/text/TestClipboardManager.java b/v1/src/main/java/com/xtremelabs/robolectric/tester/android/text/TestClipboardManager.java
index 02c8948d2..02c8948d2 100644
--- a/src/main/java/com/xtremelabs/robolectric/tester/android/text/TestClipboardManager.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/tester/android/text/TestClipboardManager.java
diff --git a/src/main/java/com/xtremelabs/robolectric/tester/android/util/TestAttributeSet.java b/v1/src/main/java/com/xtremelabs/robolectric/tester/android/util/TestAttributeSet.java
index fd4562c3b..fd4562c3b 100644
--- a/src/main/java/com/xtremelabs/robolectric/tester/android/util/TestAttributeSet.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/tester/android/util/TestAttributeSet.java
diff --git a/src/main/java/com/xtremelabs/robolectric/tester/android/util/TestFragmentManager.java b/v1/src/main/java/com/xtremelabs/robolectric/tester/android/util/TestFragmentManager.java
index 115cde4a6..115cde4a6 100644
--- a/src/main/java/com/xtremelabs/robolectric/tester/android/util/TestFragmentManager.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/tester/android/util/TestFragmentManager.java
diff --git a/src/main/java/com/xtremelabs/robolectric/tester/android/util/TestFragmentTransaction.java b/v1/src/main/java/com/xtremelabs/robolectric/tester/android/util/TestFragmentTransaction.java
index 5c5a4948d..5c5a4948d 100644
--- a/src/main/java/com/xtremelabs/robolectric/tester/android/util/TestFragmentTransaction.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/tester/android/util/TestFragmentTransaction.java
diff --git a/src/main/java/com/xtremelabs/robolectric/tester/android/view/TestMenu.java b/v1/src/main/java/com/xtremelabs/robolectric/tester/android/view/TestMenu.java
index 0ff86e16c..0ff86e16c 100644
--- a/src/main/java/com/xtremelabs/robolectric/tester/android/view/TestMenu.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/tester/android/view/TestMenu.java
diff --git a/src/main/java/com/xtremelabs/robolectric/tester/android/view/TestMenuItem.java b/v1/src/main/java/com/xtremelabs/robolectric/tester/android/view/TestMenuItem.java
index cea7467df..cea7467df 100644
--- a/src/main/java/com/xtremelabs/robolectric/tester/android/view/TestMenuItem.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/tester/android/view/TestMenuItem.java
diff --git a/src/main/java/com/xtremelabs/robolectric/tester/android/view/TestSubMenu.java b/v1/src/main/java/com/xtremelabs/robolectric/tester/android/view/TestSubMenu.java
index 6de52ecff..6de52ecff 100644
--- a/src/main/java/com/xtremelabs/robolectric/tester/android/view/TestSubMenu.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/tester/android/view/TestSubMenu.java
diff --git a/src/main/java/com/xtremelabs/robolectric/tester/android/view/TestWindow.java b/v1/src/main/java/com/xtremelabs/robolectric/tester/android/view/TestWindow.java
index d222fe7e9..d222fe7e9 100644
--- a/src/main/java/com/xtremelabs/robolectric/tester/android/view/TestWindow.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/tester/android/view/TestWindow.java
diff --git a/src/main/java/com/xtremelabs/robolectric/tester/android/view/TestWindowManager.java b/v1/src/main/java/com/xtremelabs/robolectric/tester/android/view/TestWindowManager.java
index 370befca6..370befca6 100644
--- a/src/main/java/com/xtremelabs/robolectric/tester/android/view/TestWindowManager.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/tester/android/view/TestWindowManager.java
diff --git a/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/FakeHttpLayer.java b/v1/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/FakeHttpLayer.java
index f5fa72e22..f5fa72e22 100644
--- a/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/FakeHttpLayer.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/FakeHttpLayer.java
diff --git a/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/HttpEntityStub.java b/v1/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/HttpEntityStub.java
index 3d3c05c6d..3d3c05c6d 100644
--- a/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/HttpEntityStub.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/HttpEntityStub.java
diff --git a/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/HttpRequestInfo.java b/v1/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/HttpRequestInfo.java
index c174d8722..c174d8722 100644
--- a/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/HttpRequestInfo.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/HttpRequestInfo.java
diff --git a/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/HttpResponseStub.java b/v1/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/HttpResponseStub.java
index a325b7b0e..a325b7b0e 100644
--- a/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/HttpResponseStub.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/HttpResponseStub.java
diff --git a/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/ParamsParser.java b/v1/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/ParamsParser.java
index 720317e1c..720317e1c 100644
--- a/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/ParamsParser.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/ParamsParser.java
diff --git a/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/RequestMatcher.java b/v1/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/RequestMatcher.java
index 8cc1b6d0b..8cc1b6d0b 100644
--- a/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/RequestMatcher.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/RequestMatcher.java
diff --git a/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/TestHttpResponse.java b/v1/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/TestHttpResponse.java
index 13acd1577..13acd1577 100644
--- a/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/TestHttpResponse.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/TestHttpResponse.java
diff --git a/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/impl/client/DefaultRequestDirector.java b/v1/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/impl/client/DefaultRequestDirector.java
index 1b87c7dcf..1b87c7dcf 100644
--- a/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/impl/client/DefaultRequestDirector.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/impl/client/DefaultRequestDirector.java
diff --git a/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/impl/client/HttpRedirect.java b/v1/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/impl/client/HttpRedirect.java
index fae9bfd1d..fae9bfd1d 100644
--- a/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/impl/client/HttpRedirect.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/impl/client/HttpRedirect.java
diff --git a/src/main/java/com/xtremelabs/robolectric/util/DatabaseConfig.java b/v1/src/main/java/com/xtremelabs/robolectric/util/DatabaseConfig.java
index e14dcc507..e14dcc507 100644
--- a/src/main/java/com/xtremelabs/robolectric/util/DatabaseConfig.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/util/DatabaseConfig.java
diff --git a/src/main/java/com/xtremelabs/robolectric/util/H2Map.java b/v1/src/main/java/com/xtremelabs/robolectric/util/H2Map.java
index 4edc83380..4edc83380 100644
--- a/src/main/java/com/xtremelabs/robolectric/util/H2Map.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/util/H2Map.java
diff --git a/src/main/java/com/xtremelabs/robolectric/util/H2Map_TypeForwardOnly.java b/v1/src/main/java/com/xtremelabs/robolectric/util/H2Map_TypeForwardOnly.java
index e9a9bfffe..e9a9bfffe 100644
--- a/src/main/java/com/xtremelabs/robolectric/util/H2Map_TypeForwardOnly.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/util/H2Map_TypeForwardOnly.java
diff --git a/src/main/java/com/xtremelabs/robolectric/util/I18nException.java b/v1/src/main/java/com/xtremelabs/robolectric/util/I18nException.java
index 7ab86eae2..7ab86eae2 100644
--- a/src/main/java/com/xtremelabs/robolectric/util/I18nException.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/util/I18nException.java
diff --git a/src/main/java/com/xtremelabs/robolectric/util/Join.java b/v1/src/main/java/com/xtremelabs/robolectric/util/Join.java
index 8b3ec8a74..8b3ec8a74 100644
--- a/src/main/java/com/xtremelabs/robolectric/util/Join.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/util/Join.java
diff --git a/src/main/java/com/xtremelabs/robolectric/util/PropertiesHelper.java b/v1/src/main/java/com/xtremelabs/robolectric/util/PropertiesHelper.java
index 9d62bf573..9d62bf573 100644
--- a/src/main/java/com/xtremelabs/robolectric/util/PropertiesHelper.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/util/PropertiesHelper.java
diff --git a/src/main/java/com/xtremelabs/robolectric/util/RobolectricBackgroundExecutorService.java b/v1/src/main/java/com/xtremelabs/robolectric/util/RobolectricBackgroundExecutorService.java
index b3529f19d..b3529f19d 100644
--- a/src/main/java/com/xtremelabs/robolectric/util/RobolectricBackgroundExecutorService.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/util/RobolectricBackgroundExecutorService.java
diff --git a/src/main/java/com/xtremelabs/robolectric/util/SQLite.java b/v1/src/main/java/com/xtremelabs/robolectric/util/SQLite.java
index ebfd5ada0..ebfd5ada0 100644
--- a/src/main/java/com/xtremelabs/robolectric/util/SQLite.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/util/SQLite.java
diff --git a/src/main/java/com/xtremelabs/robolectric/util/SQLiteMap.java b/v1/src/main/java/com/xtremelabs/robolectric/util/SQLiteMap.java
index 42a4401c1..42a4401c1 100644
--- a/src/main/java/com/xtremelabs/robolectric/util/SQLiteMap.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/util/SQLiteMap.java
diff --git a/src/main/java/com/xtremelabs/robolectric/util/Scheduler.java b/v1/src/main/java/com/xtremelabs/robolectric/util/Scheduler.java
index aa45f1b26..aa45f1b26 100644
--- a/src/main/java/com/xtremelabs/robolectric/util/Scheduler.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/util/Scheduler.java
diff --git a/src/main/java/com/xtremelabs/robolectric/util/Strings.java b/v1/src/main/java/com/xtremelabs/robolectric/util/Strings.java
index 69e93ad62..69e93ad62 100644
--- a/src/main/java/com/xtremelabs/robolectric/util/Strings.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/util/Strings.java
diff --git a/src/main/java/com/xtremelabs/robolectric/util/Transcript.java b/v1/src/main/java/com/xtremelabs/robolectric/util/Transcript.java
index ef21ae551..ef21ae551 100644
--- a/src/main/java/com/xtremelabs/robolectric/util/Transcript.java
+++ b/v1/src/main/java/com/xtremelabs/robolectric/util/Transcript.java
diff --git a/src/main/java/overview.html b/v1/src/main/java/overview.html
index 32dc92ab3..32dc92ab3 100644
--- a/src/main/java/overview.html
+++ b/v1/src/main/java/overview.html
diff --git a/src/test/java/android/webkit/TestWebSettingsTest.java b/v1/src/test/java/android/webkit/TestWebSettingsTest.java
index 12ae4c6bd..12ae4c6bd 100644
--- a/src/test/java/android/webkit/TestWebSettingsTest.java
+++ b/v1/src/test/java/android/webkit/TestWebSettingsTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/ApplicationResolverTest.java b/v1/src/test/java/com/xtremelabs/robolectric/ApplicationResolverTest.java
index e0469d464..e0469d464 100644
--- a/src/test/java/com/xtremelabs/robolectric/ApplicationResolverTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/ApplicationResolverTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/DotConfigTestReceiver.java b/v1/src/test/java/com/xtremelabs/robolectric/DotConfigTestReceiver.java
index 9afd46a85..9afd46a85 100644
--- a/src/test/java/com/xtremelabs/robolectric/DotConfigTestReceiver.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/DotConfigTestReceiver.java
diff --git a/src/test/java/com/xtremelabs/robolectric/IncludedDependenciesTest.java b/v1/src/test/java/com/xtremelabs/robolectric/IncludedDependenciesTest.java
index 70d5bf077..70d5bf077 100644
--- a/src/test/java/com/xtremelabs/robolectric/IncludedDependenciesTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/IncludedDependenciesTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/InstrumentDetectorTest.java b/v1/src/test/java/com/xtremelabs/robolectric/InstrumentDetectorTest.java
index 011278897..011278897 100644
--- a/src/test/java/com/xtremelabs/robolectric/InstrumentDetectorTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/InstrumentDetectorTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/R.java b/v1/src/test/java/com/xtremelabs/robolectric/R.java
index bfc8dd163..bfc8dd163 100644
--- a/src/test/java/com/xtremelabs/robolectric/R.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/R.java
diff --git a/src/test/java/com/xtremelabs/robolectric/RobolectricConfigTest.java b/v1/src/test/java/com/xtremelabs/robolectric/RobolectricConfigTest.java
index 0ad7a5b53..0ad7a5b53 100644
--- a/src/test/java/com/xtremelabs/robolectric/RobolectricConfigTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/RobolectricConfigTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/RobolectricTest.java b/v1/src/test/java/com/xtremelabs/robolectric/RobolectricTest.java
index 9248ad15d..9248ad15d 100644
--- a/src/test/java/com/xtremelabs/robolectric/RobolectricTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/RobolectricTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/RobolectricTestRunnerClassLoaderSetup.java b/v1/src/test/java/com/xtremelabs/robolectric/RobolectricTestRunnerClassLoaderSetup.java
index f44f58f8a..f44f58f8a 100644
--- a/src/test/java/com/xtremelabs/robolectric/RobolectricTestRunnerClassLoaderSetup.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/RobolectricTestRunnerClassLoaderSetup.java
diff --git a/src/test/java/com/xtremelabs/robolectric/RobolectricTestRunnerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/RobolectricTestRunnerTest.java
index a7859d95a..a7859d95a 100644
--- a/src/test/java/com/xtremelabs/robolectric/RobolectricTestRunnerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/RobolectricTestRunnerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/TemporaryBindingsTest.java b/v1/src/test/java/com/xtremelabs/robolectric/TemporaryBindingsTest.java
index 5c56ce867..5c56ce867 100644
--- a/src/test/java/com/xtremelabs/robolectric/TemporaryBindingsTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/TemporaryBindingsTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/TestApplication.java b/v1/src/test/java/com/xtremelabs/robolectric/TestApplication.java
index e59941315..e59941315 100644
--- a/src/test/java/com/xtremelabs/robolectric/TestApplication.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/TestApplication.java
diff --git a/src/test/java/com/xtremelabs/robolectric/WithCustomClassListTestRunner.java b/v1/src/test/java/com/xtremelabs/robolectric/WithCustomClassListTestRunner.java
index 68ff154bd..68ff154bd 100644
--- a/src/test/java/com/xtremelabs/robolectric/WithCustomClassListTestRunner.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/WithCustomClassListTestRunner.java
diff --git a/src/test/java/com/xtremelabs/robolectric/WithTestDefaultsRunner.java b/v1/src/test/java/com/xtremelabs/robolectric/WithTestDefaultsRunner.java
index 57e2562e6..57e2562e6 100644
--- a/src/test/java/com/xtremelabs/robolectric/WithTestDefaultsRunner.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/WithTestDefaultsRunner.java
diff --git a/src/test/java/com/xtremelabs/robolectric/WithoutTestDefaultsRunner.java b/v1/src/test/java/com/xtremelabs/robolectric/WithoutTestDefaultsRunner.java
index 6d91ba160..6d91ba160 100644
--- a/src/test/java/com/xtremelabs/robolectric/WithoutTestDefaultsRunner.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/WithoutTestDefaultsRunner.java
diff --git a/src/test/java/com/xtremelabs/robolectric/bytecode/AndroidTranslatorClassIntrumentedTest.java b/v1/src/test/java/com/xtremelabs/robolectric/bytecode/AndroidTranslatorClassIntrumentedTest.java
index 99d8280fb..99d8280fb 100644
--- a/src/test/java/com/xtremelabs/robolectric/bytecode/AndroidTranslatorClassIntrumentedTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/bytecode/AndroidTranslatorClassIntrumentedTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/bytecode/AndroidTranslatorTest.java b/v1/src/test/java/com/xtremelabs/robolectric/bytecode/AndroidTranslatorTest.java
index 8d35ce65b..8d35ce65b 100644
--- a/src/test/java/com/xtremelabs/robolectric/bytecode/AndroidTranslatorTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/bytecode/AndroidTranslatorTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/bytecode/AndroidTranslatorUnitTest.java b/v1/src/test/java/com/xtremelabs/robolectric/bytecode/AndroidTranslatorUnitTest.java
index b41f950d1..b41f950d1 100644
--- a/src/test/java/com/xtremelabs/robolectric/bytecode/AndroidTranslatorUnitTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/bytecode/AndroidTranslatorUnitTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/bytecode/ClassCacheTest.java b/v1/src/test/java/com/xtremelabs/robolectric/bytecode/ClassCacheTest.java
index e14734dfd..e14734dfd 100644
--- a/src/test/java/com/xtremelabs/robolectric/bytecode/ClassCacheTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/bytecode/ClassCacheTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/bytecode/CustomRobolectricTestRunnerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/bytecode/CustomRobolectricTestRunnerTest.java
index 5d2af05da..5d2af05da 100644
--- a/src/test/java/com/xtremelabs/robolectric/bytecode/CustomRobolectricTestRunnerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/bytecode/CustomRobolectricTestRunnerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/bytecode/Foo.java b/v1/src/test/java/com/xtremelabs/robolectric/bytecode/Foo.java
index cd93b1bd8..cd93b1bd8 100644
--- a/src/test/java/com/xtremelabs/robolectric/bytecode/Foo.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/bytecode/Foo.java
diff --git a/src/test/java/com/xtremelabs/robolectric/bytecode/RobolectricWiringTest.java b/v1/src/test/java/com/xtremelabs/robolectric/bytecode/RobolectricWiringTest.java
index 60ea55160..60ea55160 100644
--- a/src/test/java/com/xtremelabs/robolectric/bytecode/RobolectricWiringTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/bytecode/RobolectricWiringTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/bytecode/ShadowFoo.java b/v1/src/test/java/com/xtremelabs/robolectric/bytecode/ShadowFoo.java
index 06e3a6931..06e3a6931 100644
--- a/src/test/java/com/xtremelabs/robolectric/bytecode/ShadowFoo.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/bytecode/ShadowFoo.java
diff --git a/src/test/java/com/xtremelabs/robolectric/bytecode/ShadowWranglerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/bytecode/ShadowWranglerTest.java
index 45d4089ed..45d4089ed 100644
--- a/src/test/java/com/xtremelabs/robolectric/bytecode/ShadowWranglerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/bytecode/ShadowWranglerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/internal/ClassNameResolverTest.java b/v1/src/test/java/com/xtremelabs/robolectric/internal/ClassNameResolverTest.java
index 161a5470e..161a5470e 100644
--- a/src/test/java/com/xtremelabs/robolectric/internal/ClassNameResolverTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/internal/ClassNameResolverTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/matchers/StartedMatcherTest.java b/v1/src/test/java/com/xtremelabs/robolectric/matchers/StartedMatcherTest.java
index 0b4f5ebd5..0b4f5ebd5 100644
--- a/src/test/java/com/xtremelabs/robolectric/matchers/StartedMatcherTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/matchers/StartedMatcherTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/matchers/StartedServiceMatcherTest.java b/v1/src/test/java/com/xtremelabs/robolectric/matchers/StartedServiceMatcherTest.java
index 1af11533e..1af11533e 100644
--- a/src/test/java/com/xtremelabs/robolectric/matchers/StartedServiceMatcherTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/matchers/StartedServiceMatcherTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/res/AttrResourceLoaderTest.java b/v1/src/test/java/com/xtremelabs/robolectric/res/AttrResourceLoaderTest.java
index c1b91e75e..c1b91e75e 100644
--- a/src/test/java/com/xtremelabs/robolectric/res/AttrResourceLoaderTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/res/AttrResourceLoaderTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/res/ColorResourceLoaderTest.java b/v1/src/test/java/com/xtremelabs/robolectric/res/ColorResourceLoaderTest.java
index 60f183212..60f183212 100644
--- a/src/test/java/com/xtremelabs/robolectric/res/ColorResourceLoaderTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/res/ColorResourceLoaderTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/res/DimenResourceLoaderTest.java b/v1/src/test/java/com/xtremelabs/robolectric/res/DimenResourceLoaderTest.java
index 1ba3d60b2..1ba3d60b2 100644
--- a/src/test/java/com/xtremelabs/robolectric/res/DimenResourceLoaderTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/res/DimenResourceLoaderTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/res/DrawableResourceLoaderTest.java b/v1/src/test/java/com/xtremelabs/robolectric/res/DrawableResourceLoaderTest.java
index 4357e55d4..4357e55d4 100644
--- a/src/test/java/com/xtremelabs/robolectric/res/DrawableResourceLoaderTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/res/DrawableResourceLoaderTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/res/IntegerResourceLoaderTest.java b/v1/src/test/java/com/xtremelabs/robolectric/res/IntegerResourceLoaderTest.java
index 5c683e3d7..5c683e3d7 100644
--- a/src/test/java/com/xtremelabs/robolectric/res/IntegerResourceLoaderTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/res/IntegerResourceLoaderTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/res/MenuLoaderTest.java b/v1/src/test/java/com/xtremelabs/robolectric/res/MenuLoaderTest.java
index 2a702035d..2a702035d 100644
--- a/src/test/java/com/xtremelabs/robolectric/res/MenuLoaderTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/res/MenuLoaderTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/res/MenuResourceLoaderTest.java b/v1/src/test/java/com/xtremelabs/robolectric/res/MenuResourceLoaderTest.java
index 95aafdb59..95aafdb59 100644
--- a/src/test/java/com/xtremelabs/robolectric/res/MenuResourceLoaderTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/res/MenuResourceLoaderTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/res/PluralResourceLoaderTest.java b/v1/src/test/java/com/xtremelabs/robolectric/res/PluralResourceLoaderTest.java
index 739e89074..739e89074 100644
--- a/src/test/java/com/xtremelabs/robolectric/res/PluralResourceLoaderTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/res/PluralResourceLoaderTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/res/PreferenceLoaderTest.java b/v1/src/test/java/com/xtremelabs/robolectric/res/PreferenceLoaderTest.java
index e4da35902..e4da35902 100644
--- a/src/test/java/com/xtremelabs/robolectric/res/PreferenceLoaderTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/res/PreferenceLoaderTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/res/RawResourceLoaderTest.java b/v1/src/test/java/com/xtremelabs/robolectric/res/RawResourceLoaderTest.java
index a0904074c..a0904074c 100644
--- a/src/test/java/com/xtremelabs/robolectric/res/RawResourceLoaderTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/res/RawResourceLoaderTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/res/ResourceExtractorTest.java b/v1/src/test/java/com/xtremelabs/robolectric/res/ResourceExtractorTest.java
index 7041efa5e..7041efa5e 100644
--- a/src/test/java/com/xtremelabs/robolectric/res/ResourceExtractorTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/res/ResourceExtractorTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/res/ResourceLoaderTest.java b/v1/src/test/java/com/xtremelabs/robolectric/res/ResourceLoaderTest.java
index 917b2c228..917b2c228 100644
--- a/src/test/java/com/xtremelabs/robolectric/res/ResourceLoaderTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/res/ResourceLoaderTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/res/RobolectricPackageManagerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/res/RobolectricPackageManagerTest.java
index 1a7678309..1a7678309 100644
--- a/src/test/java/com/xtremelabs/robolectric/res/RobolectricPackageManagerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/res/RobolectricPackageManagerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/res/StringArrayResourceLoaderTest.java b/v1/src/test/java/com/xtremelabs/robolectric/res/StringArrayResourceLoaderTest.java
index 065d7a334..065d7a334 100644
--- a/src/test/java/com/xtremelabs/robolectric/res/StringArrayResourceLoaderTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/res/StringArrayResourceLoaderTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/res/StringResourceLoaderTest.java b/v1/src/test/java/com/xtremelabs/robolectric/res/StringResourceLoaderTest.java
index ba86ad8ff..ba86ad8ff 100644
--- a/src/test/java/com/xtremelabs/robolectric/res/StringResourceLoaderTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/res/StringResourceLoaderTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/res/TestAttributeSetTest.java b/v1/src/test/java/com/xtremelabs/robolectric/res/TestAttributeSetTest.java
index 873acae53..873acae53 100644
--- a/src/test/java/com/xtremelabs/robolectric/res/TestAttributeSetTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/res/TestAttributeSetTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/res/ViewLoaderTest.java b/v1/src/test/java/com/xtremelabs/robolectric/res/ViewLoaderTest.java
index 139056a86..139056a86 100644
--- a/src/test/java/com/xtremelabs/robolectric/res/ViewLoaderTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/res/ViewLoaderTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/AbsSeekBarTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AbsSeekBarTest.java
index 4912fdb68..4912fdb68 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/AbsSeekBarTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AbsSeekBarTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/AbsSpinnerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AbsSpinnerTest.java
index 9dbecdbdc..9dbecdbdc 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/AbsSpinnerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AbsSpinnerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/AbstractCursorTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AbstractCursorTest.java
index 60815bfcc..60815bfcc 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/AbstractCursorTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AbstractCursorTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/AccountManagerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AccountManagerTest.java
index 6cdf29ff0..6cdf29ff0 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/AccountManagerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AccountManagerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/AccountTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AccountTest.java
index abb69c84d..abb69c84d 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/AccountTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AccountTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ActivityGroupTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ActivityGroupTest.java
index 27f35841a..27f35841a 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ActivityGroupTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ActivityGroupTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ActivityManagerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ActivityManagerTest.java
index 9df19efd8..9df19efd8 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ActivityManagerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ActivityManagerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ActivityTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ActivityTest.java
index 273cce959..273cce959 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ActivityTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ActivityTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/AdapterViewBehavior.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AdapterViewBehavior.java
index 851c0bae2..851c0bae2 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/AdapterViewBehavior.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AdapterViewBehavior.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/AlarmManagerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AlarmManagerTest.java
index 5c75efec2..5c75efec2 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/AlarmManagerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AlarmManagerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/AlertDialogTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AlertDialogTest.java
index d3c72fd06..d3c72fd06 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/AlertDialogTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AlertDialogTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/AlphaAnimationTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AlphaAnimationTest.java
index ff6c50806..ff6c50806 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/AlphaAnimationTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AlphaAnimationTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/AndroidHttpClientTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AndroidHttpClientTest.java
index efb9ffffc..efb9ffffc 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/AndroidHttpClientTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AndroidHttpClientTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/AnimationSetTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AnimationSetTest.java
index ef968a896..ef968a896 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/AnimationSetTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AnimationSetTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/AnimationTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AnimationTest.java
index fc80eca3a..fc80eca3a 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/AnimationTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AnimationTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/AnimationUtilsTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AnimationUtilsTest.java
index 8aace65e3..8aace65e3 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/AnimationUtilsTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AnimationUtilsTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/AppWidgetManagerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AppWidgetManagerTest.java
index c77b51edf..c77b51edf 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/AppWidgetManagerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AppWidgetManagerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ApplicationTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ApplicationTest.java
index c65a381c6..c65a381c6 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ApplicationTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ApplicationTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ArrayAdapterTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ArrayAdapterTest.java
index 7597c538f..7597c538f 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ArrayAdapterTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ArrayAdapterTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/AssetManagerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AssetManagerTest.java
index f8b69886b..f8b69886b 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/AssetManagerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AssetManagerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/AsyncTaskTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AsyncTaskTest.java
index 54d832d25..54d832d25 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/AsyncTaskTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AsyncTaskTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/AudioManagerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AudioManagerTest.java
index 267344eb3..267344eb3 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/AudioManagerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/AudioManagerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/Base64Test.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/Base64Test.java
index dcd91d4ee..dcd91d4ee 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/Base64Test.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/Base64Test.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/BaseAdapterTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/BaseAdapterTest.java
index d4cebd6bf..d4cebd6bf 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/BaseAdapterTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/BaseAdapterTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/BinderTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/BinderTest.java
index 2b5ba9a9d..2b5ba9a9d 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/BinderTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/BinderTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/BitmapDrawableTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/BitmapDrawableTest.java
index 56d69a59b..56d69a59b 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/BitmapDrawableTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/BitmapDrawableTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/BitmapFactoryTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/BitmapFactoryTest.java
index 54d081250..54d081250 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/BitmapFactoryTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/BitmapFactoryTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/BitmapTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/BitmapTest.java
index 55c695bdd..55c695bdd 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/BitmapTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/BitmapTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/BundleTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/BundleTest.java
index 88c080aae..88c080aae 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/BundleTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/BundleTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/CameraParametersTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CameraParametersTest.java
index e220be340..e220be340 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/CameraParametersTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CameraParametersTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/CameraSizeTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CameraSizeTest.java
index ad443b8fc..ad443b8fc 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/CameraSizeTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CameraSizeTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/CameraTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CameraTest.java
index 9975c2df8..9975c2df8 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/CameraTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CameraTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/CanvasTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CanvasTest.java
index e9c14fd0c..e9c14fd0c 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/CanvasTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CanvasTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/CheckBoxTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CheckBoxTest.java
index 9fb89f476..9fb89f476 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/CheckBoxTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CheckBoxTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/CheckedTextViewTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CheckedTextViewTest.java
index d7eee2a88..d7eee2a88 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/CheckedTextViewTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CheckedTextViewTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ClipboardManagerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ClipboardManagerTest.java
index 194ea613f..194ea613f 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ClipboardManagerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ClipboardManagerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ColorTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ColorTest.java
index ca6c14a21..ca6c14a21 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ColorTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ColorTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ConfigurationTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ConfigurationTest.java
index 4db940728..4db940728 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ConfigurationTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ConfigurationTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ConnectivityManagerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ConnectivityManagerTest.java
index 7355d4a50..7355d4a50 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ConnectivityManagerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ConnectivityManagerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ContentProviderOperationBuilderTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ContentProviderOperationBuilderTest.java
index 1e1f81121..1e1f81121 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ContentProviderOperationBuilderTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ContentProviderOperationBuilderTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ContentProviderOperationTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ContentProviderOperationTest.java
index 75854fd9d..75854fd9d 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ContentProviderOperationTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ContentProviderOperationTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ContentProviderResultTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ContentProviderResultTest.java
index 680e8c012..680e8c012 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ContentProviderResultTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ContentProviderResultTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ContentProviderTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ContentProviderTest.java
index 8634f0d52..8634f0d52 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ContentProviderTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ContentProviderTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ContentResolverTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ContentResolverTest.java
index a29aaa4ce..a29aaa4ce 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ContentResolverTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ContentResolverTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ContentUrisTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ContentUrisTest.java
index 13fdd9eb9..13fdd9eb9 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ContentUrisTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ContentUrisTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ContextTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ContextTest.java
index 5978ce20b..5978ce20b 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ContextTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ContextTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ContextWrapperTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ContextWrapperTest.java
index eaf075582..eaf075582 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ContextWrapperTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ContextWrapperTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/CookieManagerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CookieManagerTest.java
index fc3bba897..fc3bba897 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/CookieManagerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CookieManagerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/CookieSyncManagerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CookieSyncManagerTest.java
index 7c1247a6e..7c1247a6e 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/CookieSyncManagerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CookieSyncManagerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/CountDownTimerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CountDownTimerTest.java
index 8e2551bbf..8e2551bbf 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/CountDownTimerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CountDownTimerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/CountingAdapter.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CountingAdapter.java
index fe491da08..fe491da08 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/CountingAdapter.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CountingAdapter.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/CriteriaTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CriteriaTest.java
index 99f3dacce..99f3dacce 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/CriteriaTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CriteriaTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/CursorAdapterTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CursorAdapterTest.java
index 4f31e6794..4f31e6794 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/CursorAdapterTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CursorAdapterTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/CursorLoaderTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CursorLoaderTest.java
index 31bf7348a..31bf7348a 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/CursorLoaderTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CursorLoaderTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/CursorWrapperTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CursorWrapperTest.java
index 6d47c14ce..6d47c14ce 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/CursorWrapperTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/CursorWrapperTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/DatabaseTestBase.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/DatabaseTestBase.java
index a951774f1..a951774f1 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/DatabaseTestBase.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/DatabaseTestBase.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/DatabaseUtilsTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/DatabaseUtilsTest.java
index c1bdebec1..c1bdebec1 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/DatabaseUtilsTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/DatabaseUtilsTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/DefaultRequestDirectorTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/DefaultRequestDirectorTest.java
index 2c4178c95..2c4178c95 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/DefaultRequestDirectorTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/DefaultRequestDirectorTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/DialogFragmentTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/DialogFragmentTest.java
index dbfd139b0..dbfd139b0 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/DialogFragmentTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/DialogFragmentTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/DialogPreferenceTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/DialogPreferenceTest.java
index 7374a3cdf..7374a3cdf 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/DialogPreferenceTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/DialogPreferenceTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/DialogTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/DialogTest.java
index 6b7886ce4..6b7886ce4 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/DialogTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/DialogTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/DisplayTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/DisplayTest.java
index 0f20caa3e..0f20caa3e 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/DisplayTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/DisplayTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/DrawableTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/DrawableTest.java
index dd4940a9b..dd4940a9b 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/DrawableTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/DrawableTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/EditTextTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/EditTextTest.java
index 9fa8d8dbb..9fa8d8dbb 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/EditTextTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/EditTextTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/EnvironmentTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/EnvironmentTest.java
index fa5376a57..fa5376a57 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/EnvironmentTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/EnvironmentTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ExpandableListViewTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ExpandableListViewTest.java
index f20c8d482..f20c8d482 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ExpandableListViewTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ExpandableListViewTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/FragmentActivityTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/FragmentActivityTest.java
index 557757877..557757877 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/FragmentActivityTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/FragmentActivityTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/FragmentManagerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/FragmentManagerTest.java
index c3bf61664..c3bf61664 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/FragmentManagerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/FragmentManagerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/FragmentTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/FragmentTest.java
index fcc92acab..fcc92acab 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/FragmentTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/FragmentTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/FragmentTransactionTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/FragmentTransactionTest.java
index a6a0e7a31..a6a0e7a31 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/FragmentTransactionTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/FragmentTransactionTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/FrameLayoutTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/FrameLayoutTest.java
index 74db0aa3e..74db0aa3e 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/FrameLayoutTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/FrameLayoutTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/GalleryTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/GalleryTest.java
index 97de42fcb..97de42fcb 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/GalleryTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/GalleryTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/GeocoderTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/GeocoderTest.java
index b2fc75f26..b2fc75f26 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/GeocoderTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/GeocoderTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/H2DatabaseTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/H2DatabaseTest.java
index da91972c9..da91972c9 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/H2DatabaseTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/H2DatabaseTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/HandlerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/HandlerTest.java
index 3d11fb388..3d11fb388 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/HandlerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/HandlerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/HandlerThreadTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/HandlerThreadTest.java
index 8e2340d5a..8e2340d5a 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/HandlerThreadTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/HandlerThreadTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/HtmlTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/HtmlTest.java
index 47c68b537..47c68b537 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/HtmlTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/HtmlTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ImageViewTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ImageViewTest.java
index 151929154..151929154 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ImageViewTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ImageViewTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/InputMethodManagerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/InputMethodManagerTest.java
index 5fedbfdff..5fedbfdff 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/InputMethodManagerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/InputMethodManagerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/IntentFilterAuthorityEntryTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/IntentFilterAuthorityEntryTest.java
index 4017c621e..4017c621e 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/IntentFilterAuthorityEntryTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/IntentFilterAuthorityEntryTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/IntentFilterTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/IntentFilterTest.java
index 088138fee..088138fee 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/IntentFilterTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/IntentFilterTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/IntentTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/IntentTest.java
index d491606c6..d491606c6 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/IntentTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/IntentTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ItemizedOverlayTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ItemizedOverlayTest.java
index 381942947..381942947 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ItemizedOverlayTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ItemizedOverlayTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/JsPromptResultTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/JsPromptResultTest.java
index e0d8fbc6c..e0d8fbc6c 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/JsPromptResultTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/JsPromptResultTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/JsResultTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/JsResultTest.java
index 561a18184..561a18184 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/JsResultTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/JsResultTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/KeyguardManagerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/KeyguardManagerTest.java
index 12a1ad12b..12a1ad12b 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/KeyguardManagerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/KeyguardManagerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/LayerDrawableTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/LayerDrawableTest.java
index 38bb9ee04..38bb9ee04 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/LayerDrawableTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/LayerDrawableTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/LayoutInflaterTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/LayoutInflaterTest.java
index e870efa3c..e870efa3c 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/LayoutInflaterTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/LayoutInflaterTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/LayoutParamsTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/LayoutParamsTest.java
index b78ecb89e..b78ecb89e 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/LayoutParamsTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/LayoutParamsTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/LinearLayoutTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/LinearLayoutTest.java
index ac4227eeb..ac4227eeb 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/LinearLayoutTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/LinearLayoutTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/LinkMovementMethodTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/LinkMovementMethodTest.java
index 07dbeb3ca..07dbeb3ca 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/LinkMovementMethodTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/LinkMovementMethodTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ListActivityTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ListActivityTest.java
index fa0b28690..fa0b28690 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ListActivityTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ListActivityTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ListFragmentTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ListFragmentTest.java
index 1295654b7..1295654b7 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ListFragmentTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ListFragmentTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ListPreferenceTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ListPreferenceTest.java
index 1b9212b75..1b9212b75 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ListPreferenceTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ListPreferenceTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ListViewTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ListViewTest.java
index e743a34b1..e743a34b1 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ListViewTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ListViewTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/LocalBroadcastManagerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/LocalBroadcastManagerTest.java
index 730b2fa1f..730b2fa1f 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/LocalBroadcastManagerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/LocalBroadcastManagerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/LocationManagerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/LocationManagerTest.java
index fd96f140c..fd96f140c 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/LocationManagerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/LocationManagerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/LocationTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/LocationTest.java
index fd0da5b13..fd0da5b13 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/LocationTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/LocationTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/LogTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/LogTest.java
index b64fad3e8..b64fad3e8 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/LogTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/LogTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/LooperTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/LooperTest.java
index b2f0c5e10..b2f0c5e10 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/LooperTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/LooperTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/MapActivityTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/MapActivityTest.java
index 6ccc41733..6ccc41733 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/MapActivityTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/MapActivityTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/MapViewTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/MapViewTest.java
index f44f01b4d..f44f01b4d 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/MapViewTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/MapViewTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/MarginLayoutParamsTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/MarginLayoutParamsTest.java
index 290125e9d..290125e9d 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/MarginLayoutParamsTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/MarginLayoutParamsTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/MatrixCursorTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/MatrixCursorTest.java
index ab40385af..ab40385af 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/MatrixCursorTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/MatrixCursorTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/MediaPlayerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/MediaPlayerTest.java
index 31c72bad8..31c72bad8 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/MediaPlayerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/MediaPlayerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/MediaRecorderTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/MediaRecorderTest.java
index 71efe6e77..71efe6e77 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/MediaRecorderTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/MediaRecorderTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/MediaStoreTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/MediaStoreTest.java
index e073427af..e073427af 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/MediaStoreTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/MediaStoreTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/MenuInflaterTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/MenuInflaterTest.java
index d75ae9a95..d75ae9a95 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/MenuInflaterTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/MenuInflaterTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/MessageTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/MessageTest.java
index 15d966a5a..15d966a5a 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/MessageTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/MessageTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/MessengerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/MessengerTest.java
index f89b44e5f..f89b44e5f 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/MessengerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/MessengerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/MimeTypeMapTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/MimeTypeMapTest.java
index 154fd45bf..154fd45bf 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/MimeTypeMapTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/MimeTypeMapTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/MotionEventTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/MotionEventTest.java
index f9704734b..f9704734b 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/MotionEventTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/MotionEventTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/NdefMessageTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/NdefMessageTest.java
index 7afd60d68..7afd60d68 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/NdefMessageTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/NdefMessageTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/NdefRecordTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/NdefRecordTest.java
index 943ec7df4..943ec7df4 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/NdefRecordTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/NdefRecordTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/NetworkInfoTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/NetworkInfoTest.java
index 0e5cf7f10..0e5cf7f10 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/NetworkInfoTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/NetworkInfoTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/NfcAdapterTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/NfcAdapterTest.java
index e985bdfe0..e985bdfe0 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/NfcAdapterTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/NfcAdapterTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/NotificationManagerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/NotificationManagerTest.java
index 695fc957b..695fc957b 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/NotificationManagerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/NotificationManagerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/NotificationTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/NotificationTest.java
index 03b2b3d01..03b2b3d01 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/NotificationTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/NotificationTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/PagerAdapterTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PagerAdapterTest.java
index 6f9d9810b..6f9d9810b 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/PagerAdapterTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PagerAdapterTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/PaintTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PaintTest.java
index 42b8d056e..42b8d056e 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/PaintTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PaintTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/PairTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PairTest.java
index 763ea1838..763ea1838 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/PairTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PairTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ParcelTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ParcelTest.java
index 763be0d77..763be0d77 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ParcelTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ParcelTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/PasswordTransformationMethodTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PasswordTransformationMethodTest.java
index da38879b3..da38879b3 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/PasswordTransformationMethodTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PasswordTransformationMethodTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/PathTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PathTest.java
index 23b10e58d..23b10e58d 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/PathTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PathTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/PendingIntentTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PendingIntentTest.java
index 154307b03..154307b03 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/PendingIntentTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PendingIntentTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/PeriodicSyncTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PeriodicSyncTest.java
index 71a0353b5..71a0353b5 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/PeriodicSyncTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PeriodicSyncTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/PhoneNumberUtilTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PhoneNumberUtilTest.java
index b9014cf4c..b9014cf4c 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/PhoneNumberUtilTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PhoneNumberUtilTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/PopupWindowTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PopupWindowTest.java
index bca27e2db..bca27e2db 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/PopupWindowTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PopupWindowTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/PowerManagerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PowerManagerTest.java
index f82284806..f82284806 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/PowerManagerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PowerManagerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceActivityTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceActivityTest.java
index 6f95f31b2..6f95f31b2 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceActivityTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceActivityTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceCategoryTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceCategoryTest.java
index 9a4b8102c..9a4b8102c 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceCategoryTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceCategoryTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceGroupTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceGroupTest.java
index 2cd332840..2cd332840 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceGroupTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceGroupTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceManagerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceManagerTest.java
index 1197565e1..1197565e1 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceManagerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceManagerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceScreenTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceScreenTest.java
index e2be12b8d..e2be12b8d 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceScreenTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceScreenTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceTest.java
index 8cec55a15..8cec55a15 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ProcessTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ProcessTest.java
index e49ff5efb..e49ff5efb 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ProcessTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ProcessTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ProgressBarTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ProgressBarTest.java
index 5b419e34e..5b419e34e 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ProgressBarTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ProgressBarTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ProgressDialogTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ProgressDialogTest.java
index f809bae8e..f809bae8e 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ProgressDialogTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ProgressDialogTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/RadioButtonTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/RadioButtonTest.java
index 1f47f5051..1f47f5051 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/RadioButtonTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/RadioButtonTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/RadioGroupTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/RadioGroupTest.java
index 115948dd4..115948dd4 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/RadioGroupTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/RadioGroupTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/RatingBarTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/RatingBarTest.java
index 081a8c48e..081a8c48e 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/RatingBarTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/RatingBarTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/RectTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/RectTest.java
index 5406e3c25..5406e3c25 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/RectTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/RectTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/RemoteCallbackListTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/RemoteCallbackListTest.java
index 66029916d..66029916d 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/RemoteCallbackListTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/RemoteCallbackListTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ResolveInfoTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ResolveInfoTest.java
index 16230e077..16230e077 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ResolveInfoTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ResolveInfoTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ResourcesTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ResourcesTest.java
index e6a240ae0..e6a240ae0 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ResourcesTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ResourcesTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ResultReceiverTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ResultReceiverTest.java
index 53e5e65ef..53e5e65ef 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ResultReceiverTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ResultReceiverTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/SQLiteCursorTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SQLiteCursorTest.java
index 9cd0d2536..9cd0d2536 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/SQLiteCursorTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SQLiteCursorTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/SQLiteDatabaseTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SQLiteDatabaseTest.java
index 729b09cbc..729b09cbc 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/SQLiteDatabaseTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SQLiteDatabaseTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/SQLiteOpenHelperTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SQLiteOpenHelperTest.java
index 563dc477a..563dc477a 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/SQLiteOpenHelperTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SQLiteOpenHelperTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/SQLiteQueryBuilderTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SQLiteQueryBuilderTest.java
index 41dc516d2..41dc516d2 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/SQLiteQueryBuilderTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SQLiteQueryBuilderTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/SQLiteStatementTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SQLiteStatementTest.java
index 00e512680..00e512680 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/SQLiteStatementTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SQLiteStatementTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ScanResultTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ScanResultTest.java
index 95dd98103..95dd98103 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ScanResultTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ScanResultTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ScrollViewTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ScrollViewTest.java
index 99fe1e195..99fe1e195 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ScrollViewTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ScrollViewTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/SeekBarTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SeekBarTest.java
index 35e7bf204..35e7bf204 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/SeekBarTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SeekBarTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/SensorManagerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SensorManagerTest.java
index 2d2fa8f94..2d2fa8f94 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/SensorManagerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SensorManagerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ServiceTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ServiceTest.java
index 8c06eacb2..8c06eacb2 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ServiceTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ServiceTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/SettingsTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SettingsTest.java
index b131831bd..b131831bd 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/SettingsTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SettingsTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ShadowAutoCompleteTextViewTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ShadowAutoCompleteTextViewTest.java
index 4a98f3e32..4a98f3e32 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ShadowAutoCompleteTextViewTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ShadowAutoCompleteTextViewTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ShadowBinderTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ShadowBinderTest.java
index ebe634085..ebe634085 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ShadowBinderTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ShadowBinderTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ShadowEditTextTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ShadowEditTextTest.java
index e9dda18a0..e9dda18a0 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ShadowEditTextTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ShadowEditTextTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ShapeDrawableTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ShapeDrawableTest.java
index e2348a279..e2348a279 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ShapeDrawableTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ShapeDrawableTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/SignatureTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SignatureTest.java
index c12e17acf..c12e17acf 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/SignatureTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SignatureTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/SmsManagerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SmsManagerTest.java
index 34c367ff6..34c367ff6 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/SmsManagerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SmsManagerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/SpannableStringBuilderTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SpannableStringBuilderTest.java
index 12fd9568a..12fd9568a 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/SpannableStringBuilderTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SpannableStringBuilderTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/SpannableStringTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SpannableStringTest.java
index fff069d1e..fff069d1e 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/SpannableStringTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SpannableStringTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/SparseArrayTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SparseArrayTest.java
index db0141ca1..db0141ca1 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/SparseArrayTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SparseArrayTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/SpinnerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SpinnerTest.java
index 1a21b7cff..1a21b7cff 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/SpinnerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SpinnerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/SslErrorHandlerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SslErrorHandlerTest.java
index ed10a0c1b..ed10a0c1b 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/SslErrorHandlerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SslErrorHandlerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/StatFsTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/StatFsTest.java
index 0c5d7efcc..0c5d7efcc 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/StatFsTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/StatFsTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/StateListDrawableTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/StateListDrawableTest.java
index 96be401fb..96be401fb 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/StateListDrawableTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/StateListDrawableTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/SyncResultTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SyncResultTest.java
index 5ccfa4467..5ccfa4467 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/SyncResultTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/SyncResultTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/TabActivityTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TabActivityTest.java
index 6d0460e5a..6d0460e5a 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/TabActivityTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TabActivityTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/TabHostTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TabHostTest.java
index cdd45db75..cdd45db75 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/TabHostTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TabHostTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/TabSpecTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TabSpecTest.java
index 74959bca2..74959bca2 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/TabSpecTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TabSpecTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/TelephonyManagerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TelephonyManagerTest.java
index c2a468914..c2a468914 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/TelephonyManagerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TelephonyManagerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/TestFragment.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TestFragment.java
index 9eb2b2539..9eb2b2539 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/TestFragment.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TestFragment.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/TestParcelable.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TestParcelable.java
index 2d9d3d691..2d9d3d691 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/TestParcelable.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TestParcelable.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/TestService.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TestService.java
index 2ffa82478..2ffa82478 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/TestService.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TestService.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/TextPaintTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TextPaintTest.java
index 488f577a8..488f577a8 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/TextPaintTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TextPaintTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/TextUtilsTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TextUtilsTest.java
index bff513751..bff513751 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/TextUtilsTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TextUtilsTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/TextViewTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TextViewTest.java
index b529f861b..b529f861b 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/TextViewTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TextViewTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/TimeTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TimeTest.java
index d1dc0e0c5..d1dc0e0c5 100755
--- a/src/test/java/com/xtremelabs/robolectric/shadows/TimeTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TimeTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ToastTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ToastTest.java
index 7451ebc01..7451ebc01 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ToastTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ToastTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/TranslateAnimationTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TranslateAnimationTest.java
index 716fe6d8e..716fe6d8e 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/TranslateAnimationTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TranslateAnimationTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/TypedArrayTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TypedArrayTest.java
index 027371913..027371913 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/TypedArrayTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TypedArrayTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/TypedValueTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TypedValueTest.java
index 7cf2d5556..7cf2d5556 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/TypedValueTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/TypedValueTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/UriMatcherTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/UriMatcherTest.java
index c3305af07..c3305af07 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/UriMatcherTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/UriMatcherTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/UriTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/UriTest.java
index 0706ffe01..0706ffe01 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/UriTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/UriTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/VibratorTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/VibratorTest.java
index 235f80de1..235f80de1 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/VibratorTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/VibratorTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/VideoViewTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/VideoViewTest.java
index c7f3ab57d..c7f3ab57d 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/VideoViewTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/VideoViewTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ViewAnimatorTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ViewAnimatorTest.java
index c54f6afac..c54f6afac 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ViewAnimatorTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ViewAnimatorTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ViewConfigurationTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ViewConfigurationTest.java
index 807858d87..807858d87 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ViewConfigurationTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ViewConfigurationTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ViewFlipperTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ViewFlipperTest.java
index 7c5b5519b..7c5b5519b 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ViewFlipperTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ViewFlipperTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ViewGroupTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ViewGroupTest.java
index 74a0225ea..74a0225ea 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ViewGroupTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ViewGroupTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ViewInnerTextTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ViewInnerTextTest.java
index 99b39b68d..99b39b68d 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ViewInnerTextTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ViewInnerTextTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ViewMeasureSpecTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ViewMeasureSpecTest.java
index 0d5603e2d..0d5603e2d 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ViewMeasureSpecTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ViewMeasureSpecTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ViewPagerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ViewPagerTest.java
index edcc5e6c4..edcc5e6c4 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ViewPagerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ViewPagerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ViewStubTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ViewStubTest.java
index f84110967..f84110967 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ViewStubTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ViewStubTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ViewTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ViewTest.java
index c0f130179..c0f130179 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ViewTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ViewTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ViewTreeObserverTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ViewTreeObserverTest.java
index 946f25b2d..946f25b2d 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/ViewTreeObserverTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/ViewTreeObserverTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/WebViewTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/WebViewTest.java
index c287d7138..c287d7138 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/WebViewTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/WebViewTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/WifiConfigurationTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/WifiConfigurationTest.java
index 32cb56c78..32cb56c78 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/WifiConfigurationTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/WifiConfigurationTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/WifiInfoTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/WifiInfoTest.java
index 431ebc27b..431ebc27b 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/WifiInfoTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/WifiInfoTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/WifiManagerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/shadows/WifiManagerTest.java
index b9e867454..b9e867454 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/WifiManagerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/shadows/WifiManagerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/tester/android/content/TestSharedPreferencesTest.java b/v1/src/test/java/com/xtremelabs/robolectric/tester/android/content/TestSharedPreferencesTest.java
index 21be3b845..21be3b845 100644
--- a/src/test/java/com/xtremelabs/robolectric/tester/android/content/TestSharedPreferencesTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/tester/android/content/TestSharedPreferencesTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/tester/android/database/SimpleTestCursorTest.java b/v1/src/test/java/com/xtremelabs/robolectric/tester/android/database/SimpleTestCursorTest.java
index 5d9f1f788..5d9f1f788 100644
--- a/src/test/java/com/xtremelabs/robolectric/tester/android/database/SimpleTestCursorTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/tester/android/database/SimpleTestCursorTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/tester/android/view/TestMenuTest.java b/v1/src/test/java/com/xtremelabs/robolectric/tester/android/view/TestMenuTest.java
index ad24100ca..ad24100ca 100644
--- a/src/test/java/com/xtremelabs/robolectric/tester/android/view/TestMenuTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/tester/android/view/TestMenuTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/tester/android/view/TestWindowTest.java b/v1/src/test/java/com/xtremelabs/robolectric/tester/android/view/TestWindowTest.java
index b5cec3939..b5cec3939 100644
--- a/src/test/java/com/xtremelabs/robolectric/tester/android/view/TestWindowTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/tester/android/view/TestWindowTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/tester/org/apache/http/FakeHttpLayerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/tester/org/apache/http/FakeHttpLayerTest.java
index 88534f08f..88534f08f 100644
--- a/src/test/java/com/xtremelabs/robolectric/tester/org/apache/http/FakeHttpLayerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/tester/org/apache/http/FakeHttpLayerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/tester/org/apache/http/ParamsParserTest.java b/v1/src/test/java/com/xtremelabs/robolectric/tester/org/apache/http/ParamsParserTest.java
index 4b57d1547..4b57d1547 100644
--- a/src/test/java/com/xtremelabs/robolectric/tester/org/apache/http/ParamsParserTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/tester/org/apache/http/ParamsParserTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/tester/org/apache/http/TestHttpResponseTest.java b/v1/src/test/java/com/xtremelabs/robolectric/tester/org/apache/http/TestHttpResponseTest.java
index 0a37a9afd..0a37a9afd 100644
--- a/src/test/java/com/xtremelabs/robolectric/tester/org/apache/http/TestHttpResponseTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/tester/org/apache/http/TestHttpResponseTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/util/CustomView.java b/v1/src/test/java/com/xtremelabs/robolectric/util/CustomView.java
index 8bfd20b32..8bfd20b32 100644
--- a/src/test/java/com/xtremelabs/robolectric/util/CustomView.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/util/CustomView.java
diff --git a/src/test/java/com/xtremelabs/robolectric/util/CustomView2.java b/v1/src/test/java/com/xtremelabs/robolectric/util/CustomView2.java
index 4f0dedf01..4f0dedf01 100644
--- a/src/test/java/com/xtremelabs/robolectric/util/CustomView2.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/util/CustomView2.java
diff --git a/src/test/java/com/xtremelabs/robolectric/util/DatabaseConfigTest.java b/v1/src/test/java/com/xtremelabs/robolectric/util/DatabaseConfigTest.java
index 78c599230..78c599230 100644
--- a/src/test/java/com/xtremelabs/robolectric/util/DatabaseConfigTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/util/DatabaseConfigTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/util/H2MapTest.java b/v1/src/test/java/com/xtremelabs/robolectric/util/H2MapTest.java
index 3e7dd16f7..3e7dd16f7 100644
--- a/src/test/java/com/xtremelabs/robolectric/util/H2MapTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/util/H2MapTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/util/H2Map_TypeForwardOnlyTest.java b/v1/src/test/java/com/xtremelabs/robolectric/util/H2Map_TypeForwardOnlyTest.java
index 673112c37..673112c37 100644
--- a/src/test/java/com/xtremelabs/robolectric/util/H2Map_TypeForwardOnlyTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/util/H2Map_TypeForwardOnlyTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/util/H2Test.java b/v1/src/test/java/com/xtremelabs/robolectric/util/H2Test.java
index 6abac3b87..6abac3b87 100644
--- a/src/test/java/com/xtremelabs/robolectric/util/H2Test.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/util/H2Test.java
diff --git a/src/test/java/com/xtremelabs/robolectric/util/NullDatabaseMap.java b/v1/src/test/java/com/xtremelabs/robolectric/util/NullDatabaseMap.java
index d80fb481f..d80fb481f 100644
--- a/src/test/java/com/xtremelabs/robolectric/util/NullDatabaseMap.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/util/NullDatabaseMap.java
diff --git a/src/test/java/com/xtremelabs/robolectric/util/NullDatabaseMapTest.java b/v1/src/test/java/com/xtremelabs/robolectric/util/NullDatabaseMapTest.java
index 14fc326f6..14fc326f6 100644
--- a/src/test/java/com/xtremelabs/robolectric/util/NullDatabaseMapTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/util/NullDatabaseMapTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/util/PropertiesHelperTest.java b/v1/src/test/java/com/xtremelabs/robolectric/util/PropertiesHelperTest.java
index f87055dbb..f87055dbb 100644
--- a/src/test/java/com/xtremelabs/robolectric/util/PropertiesHelperTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/util/PropertiesHelperTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/util/RobolectricBackgroundExecutorServiceTest.java b/v1/src/test/java/com/xtremelabs/robolectric/util/RobolectricBackgroundExecutorServiceTest.java
index 2225406f2..2225406f2 100644
--- a/src/test/java/com/xtremelabs/robolectric/util/RobolectricBackgroundExecutorServiceTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/util/RobolectricBackgroundExecutorServiceTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/util/SQLiteTestHelper.java b/v1/src/test/java/com/xtremelabs/robolectric/util/SQLiteTestHelper.java
index 2734fef42..2734fef42 100644
--- a/src/test/java/com/xtremelabs/robolectric/util/SQLiteTestHelper.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/util/SQLiteTestHelper.java
diff --git a/src/test/java/com/xtremelabs/robolectric/util/SQLite_Test.java b/v1/src/test/java/com/xtremelabs/robolectric/util/SQLite_Test.java
index b692cbebf..b692cbebf 100644
--- a/src/test/java/com/xtremelabs/robolectric/util/SQLite_Test.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/util/SQLite_Test.java
diff --git a/src/test/java/com/xtremelabs/robolectric/util/SchedulerTest.java b/v1/src/test/java/com/xtremelabs/robolectric/util/SchedulerTest.java
index cadf246e8..cadf246e8 100644
--- a/src/test/java/com/xtremelabs/robolectric/util/SchedulerTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/util/SchedulerTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/util/StringsTest.java b/v1/src/test/java/com/xtremelabs/robolectric/util/StringsTest.java
index 3aece8288..3aece8288 100644
--- a/src/test/java/com/xtremelabs/robolectric/util/StringsTest.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/util/StringsTest.java
diff --git a/src/test/java/com/xtremelabs/robolectric/util/TestAnimationListener.java b/v1/src/test/java/com/xtremelabs/robolectric/util/TestAnimationListener.java
index 692a75a45..692a75a45 100644
--- a/src/test/java/com/xtremelabs/robolectric/util/TestAnimationListener.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/util/TestAnimationListener.java
diff --git a/src/test/java/com/xtremelabs/robolectric/util/TestBroadcastReceiver.java b/v1/src/test/java/com/xtremelabs/robolectric/util/TestBroadcastReceiver.java
index 334b5c6e0..334b5c6e0 100644
--- a/src/test/java/com/xtremelabs/robolectric/util/TestBroadcastReceiver.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/util/TestBroadcastReceiver.java
diff --git a/src/test/java/com/xtremelabs/robolectric/util/TestOnClickListener.java b/v1/src/test/java/com/xtremelabs/robolectric/util/TestOnClickListener.java
index a27064ccd..a27064ccd 100644
--- a/src/test/java/com/xtremelabs/robolectric/util/TestOnClickListener.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/util/TestOnClickListener.java
diff --git a/src/test/java/com/xtremelabs/robolectric/util/TestOnLongClickListener.java b/v1/src/test/java/com/xtremelabs/robolectric/util/TestOnLongClickListener.java
index bb8f244e4..bb8f244e4 100644
--- a/src/test/java/com/xtremelabs/robolectric/util/TestOnLongClickListener.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/util/TestOnLongClickListener.java
diff --git a/src/test/java/com/xtremelabs/robolectric/util/TestR.java b/v1/src/test/java/com/xtremelabs/robolectric/util/TestR.java
index 9db68a0f0..9db68a0f0 100644
--- a/src/test/java/com/xtremelabs/robolectric/util/TestR.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/util/TestR.java
diff --git a/src/test/java/com/xtremelabs/robolectric/util/TestRunnable.java b/v1/src/test/java/com/xtremelabs/robolectric/util/TestRunnable.java
index 96695ac87..96695ac87 100644
--- a/src/test/java/com/xtremelabs/robolectric/util/TestRunnable.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/util/TestRunnable.java
diff --git a/src/test/java/com/xtremelabs/robolectric/util/TestUtil.java b/v1/src/test/java/com/xtremelabs/robolectric/util/TestUtil.java
index ee18eb5dc..ee18eb5dc 100644
--- a/src/test/java/com/xtremelabs/robolectric/util/TestUtil.java
+++ b/v1/src/test/java/com/xtremelabs/robolectric/util/TestUtil.java
diff --git a/src/test/resources/TestAndroidManifest.xml b/v1/src/test/resources/TestAndroidManifest.xml
index 40bc48554..40bc48554 100644
--- a/src/test/resources/TestAndroidManifest.xml
+++ b/v1/src/test/resources/TestAndroidManifest.xml
diff --git a/src/test/resources/TestAndroidManifestWithAppName.xml b/v1/src/test/resources/TestAndroidManifestWithAppName.xml
index 30b4b9e77..30b4b9e77 100644
--- a/src/test/resources/TestAndroidManifestWithAppName.xml
+++ b/v1/src/test/resources/TestAndroidManifestWithAppName.xml
diff --git a/src/test/resources/TestAndroidManifestWithBadAppName.xml b/v1/src/test/resources/TestAndroidManifestWithBadAppName.xml
index 0e3f7420e..0e3f7420e 100644
--- a/src/test/resources/TestAndroidManifestWithBadAppName.xml
+++ b/v1/src/test/resources/TestAndroidManifestWithBadAppName.xml
diff --git a/src/test/resources/TestAndroidManifestWithFlags.xml b/v1/src/test/resources/TestAndroidManifestWithFlags.xml
index 72eb10d14..72eb10d14 100644
--- a/src/test/resources/TestAndroidManifestWithFlags.xml
+++ b/v1/src/test/resources/TestAndroidManifestWithFlags.xml
diff --git a/src/test/resources/TestAndroidManifestWithMinSdkVersionOnly.xml b/v1/src/test/resources/TestAndroidManifestWithMinSdkVersionOnly.xml
index 279b80e84..279b80e84 100644
--- a/src/test/resources/TestAndroidManifestWithMinSdkVersionOnly.xml
+++ b/v1/src/test/resources/TestAndroidManifestWithMinSdkVersionOnly.xml
diff --git a/src/test/resources/TestAndroidManifestWithNoProcess.xml b/v1/src/test/resources/TestAndroidManifestWithNoProcess.xml
index 262353e2b..262353e2b 100644
--- a/src/test/resources/TestAndroidManifestWithNoProcess.xml
+++ b/v1/src/test/resources/TestAndroidManifestWithNoProcess.xml
diff --git a/src/test/resources/TestAndroidManifestWithPackageName.xml b/v1/src/test/resources/TestAndroidManifestWithPackageName.xml
index a3f980e40..a3f980e40 100644
--- a/src/test/resources/TestAndroidManifestWithPackageName.xml
+++ b/v1/src/test/resources/TestAndroidManifestWithPackageName.xml
diff --git a/src/test/resources/TestAndroidManifestWithProcess.xml b/v1/src/test/resources/TestAndroidManifestWithProcess.xml
index 511f651a5..511f651a5 100644
--- a/src/test/resources/TestAndroidManifestWithProcess.xml
+++ b/v1/src/test/resources/TestAndroidManifestWithProcess.xml
diff --git a/src/test/resources/TestAndroidManifestWithReceivers.xml b/v1/src/test/resources/TestAndroidManifestWithReceivers.xml
index 4b631a50c..4b631a50c 100644
--- a/src/test/resources/TestAndroidManifestWithReceivers.xml
+++ b/v1/src/test/resources/TestAndroidManifestWithReceivers.xml
diff --git a/src/test/resources/TestAndroidManifestWithSdkVersion.xml b/v1/src/test/resources/TestAndroidManifestWithSdkVersion.xml
index e96e71a23..e96e71a23 100644
--- a/src/test/resources/TestAndroidManifestWithSdkVersion.xml
+++ b/v1/src/test/resources/TestAndroidManifestWithSdkVersion.xml
diff --git a/src/test/resources/assets/assetsHome.txt b/v1/src/test/resources/assets/assetsHome.txt
index 0b27d62de..0b27d62de 100644
--- a/src/test/resources/assets/assetsHome.txt
+++ b/v1/src/test/resources/assets/assetsHome.txt
diff --git a/src/test/resources/assets/docs/extra/testing/hello.txt b/v1/src/test/resources/assets/docs/extra/testing/hello.txt
index 3462721fd..3462721fd 100644
--- a/src/test/resources/assets/docs/extra/testing/hello.txt
+++ b/v1/src/test/resources/assets/docs/extra/testing/hello.txt
diff --git a/src/test/resources/res/drawable/animation_list.xml b/v1/src/test/resources/res/drawable/animation_list.xml
index 621aa206f..621aa206f 100644
--- a/src/test/resources/res/drawable/animation_list.xml
+++ b/v1/src/test/resources/res/drawable/animation_list.xml
diff --git a/src/test/resources/res/drawable/l0_red.png b/v1/src/test/resources/res/drawable/l0_red.png
index 2a264768a..2a264768a 100644
--- a/src/test/resources/res/drawable/l0_red.png
+++ b/v1/src/test/resources/res/drawable/l0_red.png
diff --git a/src/test/resources/res/drawable/l1_orange.png b/v1/src/test/resources/res/drawable/l1_orange.png
index 016a52bdb..016a52bdb 100644
--- a/src/test/resources/res/drawable/l1_orange.png
+++ b/v1/src/test/resources/res/drawable/l1_orange.png
diff --git a/src/test/resources/res/drawable/l2_yellow.png b/v1/src/test/resources/res/drawable/l2_yellow.png
index 30f971d6f..30f971d6f 100644
--- a/src/test/resources/res/drawable/l2_yellow.png
+++ b/v1/src/test/resources/res/drawable/l2_yellow.png
diff --git a/src/test/resources/res/drawable/l3_green.png b/v1/src/test/resources/res/drawable/l3_green.png
index 67ffb0a1a..67ffb0a1a 100644
--- a/src/test/resources/res/drawable/l3_green.png
+++ b/v1/src/test/resources/res/drawable/l3_green.png
diff --git a/src/test/resources/res/drawable/l4_blue.png b/v1/src/test/resources/res/drawable/l4_blue.png
index 5528619d5..5528619d5 100644
--- a/src/test/resources/res/drawable/l4_blue.png
+++ b/v1/src/test/resources/res/drawable/l4_blue.png
diff --git a/src/test/resources/res/drawable/l5_indigo.png b/v1/src/test/resources/res/drawable/l5_indigo.png
index fbc8e4297..fbc8e4297 100644
--- a/src/test/resources/res/drawable/l5_indigo.png
+++ b/v1/src/test/resources/res/drawable/l5_indigo.png
diff --git a/src/test/resources/res/drawable/l6_violet.png b/v1/src/test/resources/res/drawable/l6_violet.png
index b9f4f8ddd..b9f4f8ddd 100644
--- a/src/test/resources/res/drawable/l6_violet.png
+++ b/v1/src/test/resources/res/drawable/l6_violet.png
diff --git a/src/test/resources/res/drawable/l7_white.png b/v1/src/test/resources/res/drawable/l7_white.png
index 288d33c43..288d33c43 100644
--- a/src/test/resources/res/drawable/l7_white.png
+++ b/v1/src/test/resources/res/drawable/l7_white.png
diff --git a/src/test/resources/res/drawable/nine_patch_drawable.9.png b/v1/src/test/resources/res/drawable/nine_patch_drawable.9.png
index 6e25b0b6b..6e25b0b6b 100644
--- a/src/test/resources/res/drawable/nine_patch_drawable.9.png
+++ b/v1/src/test/resources/res/drawable/nine_patch_drawable.9.png
diff --git a/src/test/resources/res/drawable/rainbow.xml b/v1/src/test/resources/res/drawable/rainbow.xml
index 7284f93a5..7284f93a5 100644
--- a/src/test/resources/res/drawable/rainbow.xml
+++ b/v1/src/test/resources/res/drawable/rainbow.xml
diff --git a/src/test/resources/res/drawable/state_drawable.xml b/v1/src/test/resources/res/drawable/state_drawable.xml
index 0b150ed69..0b150ed69 100644
--- a/src/test/resources/res/drawable/state_drawable.xml
+++ b/v1/src/test/resources/res/drawable/state_drawable.xml
diff --git a/src/test/resources/res/layout-land/different_screen_sizes.xml b/v1/src/test/resources/res/layout-land/different_screen_sizes.xml
index d2850b097..d2850b097 100644
--- a/src/test/resources/res/layout-land/different_screen_sizes.xml
+++ b/v1/src/test/resources/res/layout-land/different_screen_sizes.xml
diff --git a/src/test/resources/res/layout-large-v16/different_screen_sizes.xml b/v1/src/test/resources/res/layout-large-v16/different_screen_sizes.xml
index 456fe4a10..456fe4a10 100644
--- a/src/test/resources/res/layout-large-v16/different_screen_sizes.xml
+++ b/v1/src/test/resources/res/layout-large-v16/different_screen_sizes.xml
diff --git a/src/test/resources/res/layout-v11/different_screen_sizes.xml b/v1/src/test/resources/res/layout-v11/different_screen_sizes.xml
index 2ce503501..2ce503501 100644
--- a/src/test/resources/res/layout-v11/different_screen_sizes.xml
+++ b/v1/src/test/resources/res/layout-v11/different_screen_sizes.xml
diff --git a/src/test/resources/res/layout-xlarge-v11/different_screen_sizes.xml b/v1/src/test/resources/res/layout-xlarge-v11/different_screen_sizes.xml
index 29d2662f8..29d2662f8 100644
--- a/src/test/resources/res/layout-xlarge-v11/different_screen_sizes.xml
+++ b/v1/src/test/resources/res/layout-xlarge-v11/different_screen_sizes.xml
diff --git a/src/test/resources/res/layout-xlarge/different_screen_sizes.xml b/v1/src/test/resources/res/layout-xlarge/different_screen_sizes.xml
index 141fee3b3..141fee3b3 100644
--- a/src/test/resources/res/layout-xlarge/different_screen_sizes.xml
+++ b/v1/src/test/resources/res/layout-xlarge/different_screen_sizes.xml
diff --git a/src/test/resources/res/layout/.bogus_hidden_dir_for_tests/bad.xml b/v1/src/test/resources/res/layout/.bogus_hidden_dir_for_tests/bad.xml
index edff6257f..edff6257f 100644
--- a/src/test/resources/res/layout/.bogus_hidden_dir_for_tests/bad.xml
+++ b/v1/src/test/resources/res/layout/.bogus_hidden_dir_for_tests/bad.xml
diff --git a/src/test/resources/res/layout/activity_list_item.xml b/v1/src/test/resources/res/layout/activity_list_item.xml
index 5d58857a3..5d58857a3 100644
--- a/src/test/resources/res/layout/activity_list_item.xml
+++ b/v1/src/test/resources/res/layout/activity_list_item.xml
diff --git a/src/test/resources/res/layout/custom_layout.xml b/v1/src/test/resources/res/layout/custom_layout.xml
index 116e462a7..116e462a7 100644
--- a/src/test/resources/res/layout/custom_layout.xml
+++ b/v1/src/test/resources/res/layout/custom_layout.xml
diff --git a/src/test/resources/res/layout/custom_layout2.xml b/v1/src/test/resources/res/layout/custom_layout2.xml
index 4d825dae9..4d825dae9 100644
--- a/src/test/resources/res/layout/custom_layout2.xml
+++ b/v1/src/test/resources/res/layout/custom_layout2.xml
diff --git a/src/test/resources/res/layout/different_screen_sizes.xml b/v1/src/test/resources/res/layout/different_screen_sizes.xml
index b989d9e10..b989d9e10 100644
--- a/src/test/resources/res/layout/different_screen_sizes.xml
+++ b/v1/src/test/resources/res/layout/different_screen_sizes.xml
diff --git a/src/test/resources/res/layout/fragment_activity.xml b/v1/src/test/resources/res/layout/fragment_activity.xml
index 8e622f040..8e622f040 100644
--- a/src/test/resources/res/layout/fragment_activity.xml
+++ b/v1/src/test/resources/res/layout/fragment_activity.xml
diff --git a/src/test/resources/res/layout/included_layout_parent.xml b/v1/src/test/resources/res/layout/included_layout_parent.xml
index a0608d22e..a0608d22e 100644
--- a/src/test/resources/res/layout/included_layout_parent.xml
+++ b/v1/src/test/resources/res/layout/included_layout_parent.xml
diff --git a/src/test/resources/res/layout/included_linear_layout.xml b/v1/src/test/resources/res/layout/included_linear_layout.xml
index 3d32f8390..3d32f8390 100644
--- a/src/test/resources/res/layout/included_linear_layout.xml
+++ b/v1/src/test/resources/res/layout/included_linear_layout.xml
diff --git a/src/test/resources/res/layout/inner_merge.xml b/v1/src/test/resources/res/layout/inner_merge.xml
index 7bb23c303..7bb23c303 100644
--- a/src/test/resources/res/layout/inner_merge.xml
+++ b/v1/src/test/resources/res/layout/inner_merge.xml
diff --git a/src/test/resources/res/layout/main.xml b/v1/src/test/resources/res/layout/main.xml
index a2c25e254..a2c25e254 100644
--- a/src/test/resources/res/layout/main.xml
+++ b/v1/src/test/resources/res/layout/main.xml
diff --git a/src/test/resources/res/layout/mapview.xml b/v1/src/test/resources/res/layout/mapview.xml
index 4d6689475..4d6689475 100644
--- a/src/test/resources/res/layout/mapview.xml
+++ b/v1/src/test/resources/res/layout/mapview.xml
diff --git a/src/test/resources/res/layout/media.xml b/v1/src/test/resources/res/layout/media.xml
index 2e958226d..2e958226d 100644
--- a/src/test/resources/res/layout/media.xml
+++ b/v1/src/test/resources/res/layout/media.xml
diff --git a/src/test/resources/res/layout/outer.xml b/v1/src/test/resources/res/layout/outer.xml
index ffa93d269..ffa93d269 100644
--- a/src/test/resources/res/layout/outer.xml
+++ b/v1/src/test/resources/res/layout/outer.xml
diff --git a/src/test/resources/res/layout/override_include.xml b/v1/src/test/resources/res/layout/override_include.xml
index bd38adce6..bd38adce6 100644
--- a/src/test/resources/res/layout/override_include.xml
+++ b/v1/src/test/resources/res/layout/override_include.xml
diff --git a/src/test/resources/res/layout/request_focus.xml b/v1/src/test/resources/res/layout/request_focus.xml
index 128711881..128711881 100644
--- a/src/test/resources/res/layout/request_focus.xml
+++ b/v1/src/test/resources/res/layout/request_focus.xml
diff --git a/src/test/resources/res/layout/request_focus_with_two_edit_texts.xml b/v1/src/test/resources/res/layout/request_focus_with_two_edit_texts.xml
index aa11bb649..aa11bb649 100644
--- a/src/test/resources/res/layout/request_focus_with_two_edit_texts.xml
+++ b/v1/src/test/resources/res/layout/request_focus_with_two_edit_texts.xml
diff --git a/src/test/resources/res/layout/snippet.xml b/v1/src/test/resources/res/layout/snippet.xml
index c4a3676c3..c4a3676c3 100644
--- a/src/test/resources/res/layout/snippet.xml
+++ b/v1/src/test/resources/res/layout/snippet.xml
diff --git a/src/test/resources/res/layout/tab_activity.xml b/v1/src/test/resources/res/layout/tab_activity.xml
index cd7d860dd..cd7d860dd 100644
--- a/src/test/resources/res/layout/tab_activity.xml
+++ b/v1/src/test/resources/res/layout/tab_activity.xml
diff --git a/src/test/resources/res/layout/text_views.xml b/v1/src/test/resources/res/layout/text_views.xml
index 4084f3d8b..4084f3d8b 100644
--- a/src/test/resources/res/layout/text_views.xml
+++ b/v1/src/test/resources/res/layout/text_views.xml
diff --git a/src/test/resources/res/layout/text_views_hints.xml b/v1/src/test/resources/res/layout/text_views_hints.xml
index b0e5dd079..b0e5dd079 100644
--- a/src/test/resources/res/layout/text_views_hints.xml
+++ b/v1/src/test/resources/res/layout/text_views_hints.xml
diff --git a/src/test/resources/res/layout/toplevel_merge.xml b/v1/src/test/resources/res/layout/toplevel_merge.xml
index 24f462255..24f462255 100644
--- a/src/test/resources/res/layout/toplevel_merge.xml
+++ b/v1/src/test/resources/res/layout/toplevel_merge.xml
diff --git a/src/test/resources/res/layout/views.xml b/v1/src/test/resources/res/layout/views.xml
index 5d96d40f7..5d96d40f7 100644
--- a/src/test/resources/res/layout/views.xml
+++ b/v1/src/test/resources/res/layout/views.xml
diff --git a/src/test/resources/res/layout/webview_holder.xml b/v1/src/test/resources/res/layout/webview_holder.xml
index 8ca954ded..8ca954ded 100644
--- a/src/test/resources/res/layout/webview_holder.xml
+++ b/v1/src/test/resources/res/layout/webview_holder.xml
diff --git a/src/test/resources/res/layout/with_invalid_onclick.xml b/v1/src/test/resources/res/layout/with_invalid_onclick.xml
index 74ac195b9..74ac195b9 100644
--- a/src/test/resources/res/layout/with_invalid_onclick.xml
+++ b/v1/src/test/resources/res/layout/with_invalid_onclick.xml
diff --git a/src/test/resources/res/menu/test.xml b/v1/src/test/resources/res/menu/test.xml
index cd5a991dd..cd5a991dd 100644
--- a/src/test/resources/res/menu/test.xml
+++ b/v1/src/test/resources/res/menu/test.xml
diff --git a/src/test/resources/res/menu/test_withchilds.xml b/v1/src/test/resources/res/menu/test_withchilds.xml
index a1e868f3e..a1e868f3e 100644
--- a/src/test/resources/res/menu/test_withchilds.xml
+++ b/v1/src/test/resources/res/menu/test_withchilds.xml
diff --git a/src/test/resources/res/raw/raw_no_ext b/v1/src/test/resources/res/raw/raw_no_ext
index bfc4c5f69..bfc4c5f69 100644
--- a/src/test/resources/res/raw/raw_no_ext
+++ b/v1/src/test/resources/res/raw/raw_no_ext
diff --git a/src/test/resources/res/raw/raw_resource.txt b/v1/src/test/resources/res/raw/raw_resource.txt
index 6f462288b..6f462288b 100644
--- a/src/test/resources/res/raw/raw_resource.txt
+++ b/v1/src/test/resources/res/raw/raw_resource.txt
diff --git a/src/test/resources/res/values-fr/strings.xml b/v1/src/test/resources/res/values-fr/strings.xml
index 04fdf3fdf..04fdf3fdf 100644
--- a/src/test/resources/res/values-fr/strings.xml
+++ b/v1/src/test/resources/res/values-fr/strings.xml
diff --git a/src/test/resources/res/values/attrs.xml b/v1/src/test/resources/res/values/attrs.xml
index b0f0b1298..b0f0b1298 100644
--- a/src/test/resources/res/values/attrs.xml
+++ b/v1/src/test/resources/res/values/attrs.xml
diff --git a/src/test/resources/res/values/colors.xml b/v1/src/test/resources/res/values/colors.xml
index 01f249b31..01f249b31 100644
--- a/src/test/resources/res/values/colors.xml
+++ b/v1/src/test/resources/res/values/colors.xml
diff --git a/src/test/resources/res/values/dimens.xml b/v1/src/test/resources/res/values/dimens.xml
index 1904b8965..1904b8965 100644
--- a/src/test/resources/res/values/dimens.xml
+++ b/v1/src/test/resources/res/values/dimens.xml
diff --git a/src/test/resources/res/values/integer.xml b/v1/src/test/resources/res/values/integer.xml
index 915c73e1b..915c73e1b 100644
--- a/src/test/resources/res/values/integer.xml
+++ b/v1/src/test/resources/res/values/integer.xml
diff --git a/src/test/resources/res/values/plurals.xml b/v1/src/test/resources/res/values/plurals.xml
index 47021974b..47021974b 100644
--- a/src/test/resources/res/values/plurals.xml
+++ b/v1/src/test/resources/res/values/plurals.xml
diff --git a/src/test/resources/res/values/string_arrays.xml b/v1/src/test/resources/res/values/string_arrays.xml
index fc3841438..fc3841438 100644
--- a/src/test/resources/res/values/string_arrays.xml
+++ b/v1/src/test/resources/res/values/string_arrays.xml
diff --git a/src/test/resources/res/values/strings.xml b/v1/src/test/resources/res/values/strings.xml
index 7ba410ee2..7ba410ee2 100644
--- a/src/test/resources/res/values/strings.xml
+++ b/v1/src/test/resources/res/values/strings.xml
diff --git a/src/test/resources/res/xml/preferences.xml b/v1/src/test/resources/res/xml/preferences.xml
index ad4f095fc..ad4f095fc 100644
--- a/src/test/resources/res/xml/preferences.xml
+++ b/v1/src/test/resources/res/xml/preferences.xml
diff --git a/update-downloads.rb b/v1/update-downloads.rb
index 308460555..308460555 100755
--- a/update-downloads.rb
+++ b/v1/update-downloads.rb
diff --git a/v3/LICENSE.txt b/v3/LICENSE.txt
new file mode 100644
index 000000000..83e0c2e82
--- /dev/null
+++ b/v3/LICENSE.txt
@@ -0,0 +1,23 @@
+Found at: https://github.com/robolectric/robolectric/blob/master/LICENSE.txt
+
+The MIT License
+
+Copyright (c) 2010 Xtreme Labs and Pivotal Labs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file
diff --git a/v3/README.txt b/v3/README.txt
new file mode 100644
index 000000000..b345f97df
--- /dev/null
+++ b/v3/README.txt
@@ -0,0 +1,42 @@
+Robolectric source code is distributed at https://github.com/robolectric/robolectric
+
+#
+# Jars built from source
+#
+Robolectric commit sha1: 2c10ae67202575ca1534a2961c5afcaabe3a53fc
+
+Jars built from source:
+robolectric-*-3.0-SNAPSHOT.jar
+shadows-*-3.0-SNAPSHOT.jar
+runtime/shadows-core-3.0-SNAPSHOT-*.jar
+
+
+#
+# Jars built by Robolectric team
+#
+runtime/android-all-4.1.2_r1-robolectric-0.jar
+Download link: http://central.maven.org/maven2/org/robolectric/android-all/4.1.2_r1-robolectric-0/android-all-4.1.2_r1-robolectric-0.jar
+
+runtime/android-all-4.2.2_r1.2-robolectric-0.jar
+Download link: http://central.maven.org/maven2/org/robolectric/android-all/4.2.2_r1.2-robolectric-0/android-all-4.2.2_r1.2-robolectric-0.jar
+
+runtime/android-all-4.3_r2-robolectric-0.jar
+Download link: http://central.maven.org/maven2/org/robolectric/android-all/4.3_r2-robolectric-0/android-all-4.3_r2-robolectric-0.jar
+
+runtime/android-all-4.4_r1-robolectric-1.jar
+Download link: http://central.maven.org/maven2/org/robolectric/android-all/4.4_r1-robolectric-1/android-all-4.4_r1-robolectric-1.jar
+
+runtime/android-all-5.0.0_r2-robolectric-1.jar
+Download link: http://central.maven.org/maven2/org/robolectric/android-all/5.0.0_r2-robolectric-1/android-all-5.0.0_r2-robolectric-1.jar
+
+
+#
+# Other runtime only dependencies (included here for simplicity in test confinguration)
+#
+runtime/json-20080701.jar
+Download link: http://central.maven.org/maven2/org/json/json/20080701/json-20080701.jar
+license: http://www.json.org/license.html
+
+runtime/tagsoup-1.2.jar
+Download link: http://central.maven.org/maven2/org/ccil/cowan/tagsoup/tagsoup/1.2/tagsoup-1.2.jar
+license: http://home.ccil.org/~cowan/tagsoup/ (Apache v2)
diff --git a/v3/build.gradle b/v3/build.gradle
new file mode 100644
index 000000000..4dbff890b
--- /dev/null
+++ b/v3/build.gradle
@@ -0,0 +1,40 @@
+apply plugin: 'java'
+
+// Create an implicit target which is a collection of jars
+// required for running Robolectric v3 tests
+
+// Heavily inspired by its google3 equivalent at
+// https://cs.corp.google.com/#piper///depot/google3/third_party/java/robolectric/v3_0_SNAPSHOT/BUILD
+
+sourceSets {
+    main.java.srcDirs = []
+    test.java.srcDirs = []
+}
+
+dependencies {
+    compile "org.ow2.asm:asm:5.0.3"
+    compile "org.ow2.asm:asm-commons:5.0.3"
+    compile "org.ow2.asm:asm-tree:5.0.3"
+    compile "org.ow2.asm:asm-util:5.0.3"
+    compile "org.apache.ant:ant:1.8.0"
+    compile "com.google.guava:guava:17.0"
+    compile "org.apache.httpcomponents:httpclient:4.1.1"
+    compile "org.bouncycastle:bcprov-jdk15on:1.48"
+    compile "com.ibm.icu:icu4j:54.1.1"
+
+    // Prebuilts only needed for Robolectric and less useful
+    // for other teams.
+    compile files("libs/sqlite4java-0.282.jar")
+    compile files("libs/vtd-xml-2.11.jar")
+
+    // Jars built by the Robolectric team used across all
+    // Android versions
+    compile fileTree(dir: ".", include: "*.jar")
+
+    // Use highest version of Android supported by Robolectric for
+    // compilation. Actual implementation jar will be decided at
+    // runtime based on sdk version specified in test.
+    compile files("runtime/android-all-5.0.0_r2-robolectric-1.jar")
+    compile files("runtime/json-20080701.jar")
+    compile files("runtime/shadows-core-3.0-SNAPSHOT-21.jar")
+}
diff --git a/v3/libs/README.txt b/v3/libs/README.txt
new file mode 100644
index 000000000..6fb9e1dda
--- /dev/null
+++ b/v3/libs/README.txt
@@ -0,0 +1,11 @@
+The following are links to where each of these jars were downloaded and a link
+to their license.
+
+sqlite4java-0.282:
+jar: http://central.maven.org/maven2/com/almworks/sqlite4java/sqlite4java/0.282/sqlite4java-0.282.jar
+license: https://code.google.com/p/sqlite4java/ (Apache v2)
+
+vtd-xml-2.11:
+jar: http://mvnrepository.com/artifact/com.ximpleware/vtd-xml/2.11
+license: http://sourceforge.net/projects/vtd-xml/ (GPL v2)
+
diff --git a/v3/libs/sqlite4java-0.282.jar b/v3/libs/sqlite4java-0.282.jar
new file mode 100644
index 000000000..686098fe4
--- /dev/null
+++ b/v3/libs/sqlite4java-0.282.jar
diff --git a/v3/libs/vtd-xml-2.11.jar b/v3/libs/vtd-xml-2.11.jar
new file mode 100644
index 000000000..ecf0e2f8c
--- /dev/null
+++ b/v3/libs/vtd-xml-2.11.jar
diff --git a/v3/robolectric-3.0-SNAPSHOT.jar b/v3/robolectric-3.0-SNAPSHOT.jar
new file mode 100644
index 000000000..65ca8f847
--- /dev/null
+++ b/v3/robolectric-3.0-SNAPSHOT.jar
diff --git a/v3/robolectric-annotations-3.0-SNAPSHOT.jar b/v3/robolectric-annotations-3.0-SNAPSHOT.jar
new file mode 100644
index 000000000..a57159ae5
--- /dev/null
+++ b/v3/robolectric-annotations-3.0-SNAPSHOT.jar
diff --git a/v3/robolectric-processor-3.0-SNAPSHOT.jar b/v3/robolectric-processor-3.0-SNAPSHOT.jar
new file mode 100644
index 000000000..9146f4471
--- /dev/null
+++ b/v3/robolectric-processor-3.0-SNAPSHOT.jar
diff --git a/v3/robolectric-resources-3.0-SNAPSHOT.jar b/v3/robolectric-resources-3.0-SNAPSHOT.jar
new file mode 100644
index 000000000..566252d36
--- /dev/null
+++ b/v3/robolectric-resources-3.0-SNAPSHOT.jar
diff --git a/v3/robolectric-utils-3.0-SNAPSHOT.jar b/v3/robolectric-utils-3.0-SNAPSHOT.jar
new file mode 100644
index 000000000..c3447446a
--- /dev/null
+++ b/v3/robolectric-utils-3.0-SNAPSHOT.jar
diff --git a/v3/runtime/android-all-4.1.2_r1-robolectric-0.jar b/v3/runtime/android-all-4.1.2_r1-robolectric-0.jar
new file mode 100644
index 000000000..59850966c
--- /dev/null
+++ b/v3/runtime/android-all-4.1.2_r1-robolectric-0.jar
diff --git a/v3/runtime/android-all-4.2.2_r1.2-robolectric-0.jar b/v3/runtime/android-all-4.2.2_r1.2-robolectric-0.jar
new file mode 100644
index 000000000..7884005e3
--- /dev/null
+++ b/v3/runtime/android-all-4.2.2_r1.2-robolectric-0.jar
diff --git a/v3/runtime/android-all-4.3_r2-robolectric-0.jar b/v3/runtime/android-all-4.3_r2-robolectric-0.jar
new file mode 100644
index 000000000..c9dffbc13
--- /dev/null
+++ b/v3/runtime/android-all-4.3_r2-robolectric-0.jar
diff --git a/v3/runtime/android-all-4.4_r1-robolectric-1.jar b/v3/runtime/android-all-4.4_r1-robolectric-1.jar
new file mode 100644
index 000000000..6bed26eef
--- /dev/null
+++ b/v3/runtime/android-all-4.4_r1-robolectric-1.jar
diff --git a/v3/runtime/android-all-5.0.0_r2-robolectric-1.jar b/v3/runtime/android-all-5.0.0_r2-robolectric-1.jar
new file mode 100644
index 000000000..7ba2a9085
--- /dev/null
+++ b/v3/runtime/android-all-5.0.0_r2-robolectric-1.jar
diff --git a/v3/runtime/json-20080701.jar b/v3/runtime/json-20080701.jar
new file mode 100644
index 000000000..c9a093edb
--- /dev/null
+++ b/v3/runtime/json-20080701.jar
diff --git a/v3/runtime/shadows-core-3.0-SNAPSHOT-16.jar b/v3/runtime/shadows-core-3.0-SNAPSHOT-16.jar
new file mode 100644
index 000000000..01d952ef8
--- /dev/null
+++ b/v3/runtime/shadows-core-3.0-SNAPSHOT-16.jar
diff --git a/v3/runtime/shadows-core-3.0-SNAPSHOT-17.jar b/v3/runtime/shadows-core-3.0-SNAPSHOT-17.jar
new file mode 100644
index 000000000..47b788413
--- /dev/null
+++ b/v3/runtime/shadows-core-3.0-SNAPSHOT-17.jar
diff --git a/v3/runtime/shadows-core-3.0-SNAPSHOT-18.jar b/v3/runtime/shadows-core-3.0-SNAPSHOT-18.jar
new file mode 100644
index 000000000..999208dc3
--- /dev/null
+++ b/v3/runtime/shadows-core-3.0-SNAPSHOT-18.jar
diff --git a/v3/runtime/shadows-core-3.0-SNAPSHOT-19.jar b/v3/runtime/shadows-core-3.0-SNAPSHOT-19.jar
new file mode 100644
index 000000000..261170a76
--- /dev/null
+++ b/v3/runtime/shadows-core-3.0-SNAPSHOT-19.jar
diff --git a/v3/runtime/shadows-core-3.0-SNAPSHOT-21.jar b/v3/runtime/shadows-core-3.0-SNAPSHOT-21.jar
new file mode 100644
index 000000000..2b7ea1ce6
--- /dev/null
+++ b/v3/runtime/shadows-core-3.0-SNAPSHOT-21.jar
diff --git a/v3/runtime/tagsoup-1.2.jar b/v3/runtime/tagsoup-1.2.jar
new file mode 100644
index 000000000..af27803ec
--- /dev/null
+++ b/v3/runtime/tagsoup-1.2.jar
diff --git a/v3/shadows-httpclient-3.0-SNAPSHOT.jar b/v3/shadows-httpclient-3.0-SNAPSHOT.jar
new file mode 100644
index 000000000..08795fff7
--- /dev/null
+++ b/v3/shadows-httpclient-3.0-SNAPSHOT.jar
diff --git a/v3/shadows-multidex-3.0-SNAPSHOT.jar b/v3/shadows-multidex-3.0-SNAPSHOT.jar
new file mode 100644
index 000000000..3ba04a2bd
--- /dev/null
+++ b/v3/shadows-multidex-3.0-SNAPSHOT.jar
diff --git a/v3/shadows-play-services-3.0-SNAPSHOT.jar b/v3/shadows-play-services-3.0-SNAPSHOT.jar
new file mode 100644
index 000000000..a932d953f
--- /dev/null
+++ b/v3/shadows-play-services-3.0-SNAPSHOT.jar
diff --git a/v3/shadows-support-v4-3.0-SNAPSHOT.jar b/v3/shadows-support-v4-3.0-SNAPSHOT.jar
new file mode 100644
index 000000000..44ffa29c2
--- /dev/null
+++ b/v3/shadows-support-v4-3.0-SNAPSHOT.jar
diff --git a/v3/update_robolectric.sh b/v3/update_robolectric.sh
new file mode 100644
index 000000000..7c90ecb82
--- /dev/null
+++ b/v3/update_robolectric.sh
@@ -0,0 +1,31 @@
+# Script to update robolectric with an up to date snapshot.
+#
+# 1) Build and install Robolectric to your local mvn repository.
+#    ./install-robolectric.sh
+#
+# 2) Create an Android repo
+#
+# 3) Run this script from $ANDROID_ROOT_DIR
+#    ./external/robolectric/v3/update_robolectric.sh
+
+MVN_ROOT=$HOME/.m2/repository
+ROBOLECTRIC_DIR=external/robolectric/v3
+
+cp $MVN_ROOT/org/robolectric/robolectric/3.0-SNAPSHOT/robolectric-3.0-SNAPSHOT.jar $ROBOLECTRIC_DIR/.
+cp $MVN_ROOT/org/robolectric/robolectric-annotations/3.0-SNAPSHOT/robolectric-annotations-3.0-SNAPSHOT.jar $ROBOLECTRIC_DIR/.
+cp $MVN_ROOT/org/robolectric/robolectric-processor/3.0-SNAPSHOT/robolectric-processor-3.0-SNAPSHOT.jar $ROBOLECTRIC_DIR/.
+cp $MVN_ROOT/org/robolectric/robolectric-resources/3.0-SNAPSHOT/robolectric-resources-3.0-SNAPSHOT.jar $ROBOLECTRIC_DIR/.
+cp $MVN_ROOT/org/robolectric/robolectric-utils/3.0-SNAPSHOT/robolectric-utils-3.0-SNAPSHOT.jar $ROBOLECTRIC_DIR/.
+
+cp $MVN_ROOT/org/robolectric/shadows-httpclient/3.0-SNAPSHOT/shadows-httpclient-3.0-SNAPSHOT.jar $ROBOLECTRIC_DIR/.
+cp $MVN_ROOT/org/robolectric/shadows-support-v4/3.0-SNAPSHOT/shadows-support-v4-3.0-SNAPSHOT.jar $ROBOLECTRIC_DIR/.
+cp $MVN_ROOT/org/robolectric/shadows-multidex/3.0-SNAPSHOT/shadows-multidex-3.0-SNAPSHOT.jar $ROBOLECTRIC_DIR/.
+
+cp $MVN_ROOT/org/robolectric/shadows-play-services/3.0-SNAPSHOT/shadows-play-services-3.0-SNAPSHOT.jar $ROBOLECTRIC_DIR/.
+
+cp $MVN_ROOT/org/robolectric/shadows-core/3.0-SNAPSHOT/shadows-core-3.0-SNAPSHOT-16.jar $ROBOLECTRIC_DIR/runtime/.
+cp $MVN_ROOT/org/robolectric/shadows-core/3.0-SNAPSHOT/shadows-core-3.0-SNAPSHOT-17.jar $ROBOLECTRIC_DIR/runtime/.
+cp $MVN_ROOT/org/robolectric/shadows-core/3.0-SNAPSHOT/shadows-core-3.0-SNAPSHOT-18.jar $ROBOLECTRIC_DIR/runtime/.
+cp $MVN_ROOT/org/robolectric/shadows-core/3.0-SNAPSHOT/shadows-core-3.0-SNAPSHOT-19.jar $ROBOLECTRIC_DIR/runtime/.
+cp $MVN_ROOT/org/robolectric/shadows-core/3.0-SNAPSHOT/shadows-core-3.0-SNAPSHOT-21.jar $ROBOLECTRIC_DIR/runtime/.
+