Merge pull request ReactiveX#321 from benjchristensen/android-merge

AtomicObservableSubscription to SafeObservableSubscription

Author: benjchristensen

rxjava-contrib/rxjava-android/src/main/java/rx/android/concurrency/HandlerThreadScheduler.java

@@ -8,7 +8,7 @@
 import org.robolectric.annotation.Config;
 import rx.Scheduler;
 import rx.Subscription;
-import rx.operators.AtomicObservableSubscription;
+import rx.operators.SafeObservableSubscription;
 import rx.util.functions.Func2;
 
 import java.util.concurrent.TimeUnit;
@@ -57,7 +57,7 @@ public <T> Subscription schedule(final T state, final Func2<Scheduler, T, Subscr
      */
     @Override
     public <T> Subscription schedule(final T state, final Func2<Scheduler, T, Subscription> action, long delayTime, TimeUnit unit) {
-        final AtomicObservableSubscription subscription = new AtomicObservableSubscription();
+        final SafeObservableSubscription subscription = new SafeObservableSubscription();
         final Scheduler _scheduler = this;
         handler.postDelayed(new Runnable() {
             @Override