commit 69ec3afd0844994a8dd739279a55143e6437ae54
author Jeff Brown <jeffbrown@google.com> Tue May 08 10:51:22 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 08 10:51:22 2012 -0700
tree a49fce9a6c3029dc6a45125046e1488f96d983e5
parent 2b362f7d8dd037dabe821e282e8a49b63f501802
parent 11c3f85ab75cd21a1975025c6d8614e710161baa

Merge "Move CancellationSignal to android.os package." into jb-dev

src/com/android/providers/contacts/ContactsProvider2.java

diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index c46f09c..a328bb2 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -65,7 +65,6 @@
 import android.accounts.AccountManager;
 import android.accounts.OnAccountsUpdateListener;
 import android.app.SearchManager;
-import android.content.CancellationSignal;
 import android.content.ContentProviderOperation;
 import android.content.ContentProviderResult;
 import android.content.ContentResolver;
@@ -98,6 +97,7 @@
 import android.os.AsyncTask;
 import android.os.Binder;
 import android.os.Bundle;
+import android.os.CancellationSignal;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Message;

src/com/android/providers/contacts/ProfileProvider.java

diff --git a/src/com/android/providers/contacts/ProfileProvider.java b/src/com/android/providers/contacts/ProfileProvider.java
index 360909f..d97760d 100644
--- a/src/com/android/providers/contacts/ProfileProvider.java
+++ b/src/com/android/providers/contacts/ProfileProvider.java
@@ -15,13 +15,13 @@
  */
 package com.android.providers.contacts;
 
-import android.content.CancellationSignal;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.res.AssetFileDescriptor;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
+import android.os.CancellationSignal;
 
 import java.io.FileNotFoundException;
 import java.util.Locale;