History log of /external/robolectric/src/main/java/com/xtremelabs/robolectric/shadows/ShadowResultReceiver.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
a739b57a6b1a99f14d586f609f0f62f48b8e2284 07-Jul-2011 Ian Fisher & Tyler Schultz <pair+ifisher+tyler@pivotallabs.com> Merge remote branch 'shoptap/master'

Conflicts:
src/main/java/com/xtremelabs/robolectric/Robolectric.java
src/main/java/com/xtremelabs/robolectric/shadows/ShadowTextView.java
src/main/java/com/xtremelabs/robolectric/shadows/ShadowView.java
src/test/java/com/xtremelabs/robolectric/shadows/IntentTest.java
src/test/java/com/xtremelabs/robolectric/shadows/ListViewTest.java
src/test/java/com/xtremelabs/robolectric/shadows/TextViewTest.java
src/test/java/com/xtremelabs/robolectric/shadows/ViewTest.java
/external/robolectric/src/main/java/com/xtremelabs/robolectric/shadows/ShadowResultReceiver.java