Merge branch 'master' of https://github.com/ReactiveX/RxAndroid

JakeWharton · JakeWharton · commit 508eada444bb · 2015-12-09T18:20:58.000-05:00
diff --git a/rxandroid/src/main/java/rx/android/MainThreadSubscription.java b/rxandroid/src/main/java/rx/android/MainThreadSubscription.java
@@ -36,7 +36,7 @@
  *
  *   // TODO set up behavior
  *
- *   subscriber.add(new MainThreadSubscriber() {
+ *   subscriber.add(new MainThreadSubscription() {
  *     &#064;Override public void onUnsubscribe() {
  *       // TODO undo behavior
  *     }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`*`
`37`	`37`	`* // TODO set up behavior`
`38`	`38`	`*`
`39`		`- * subscriber.add(new MainThreadSubscriber() {`
	`39`	`+ * subscriber.add(new MainThreadSubscription() {`
`40`	`40`	`* @Override public void onUnsubscribe() {`
`41`	`41`	`* // TODO undo behavior`
`42`	`42`	`* }`