summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-05-07 20:06:46 -0700
committerJeff Brown <jeffbrown@google.com>2012-05-07 20:06:46 -0700
commita7771df3696954f0e279407e8894a916a7cb26cc (patch)
tree3615be79c515fad41808d2b84ac0221ba5a7e299 /tools
parent507f5586fb48f59f7b4f2fa0ca5387e4d4f2bd8d (diff)
downloadframeworks_base-a7771df3696954f0e279407e8894a916a7cb26cc.zip
frameworks_base-a7771df3696954f0e279407e8894a916a7cb26cc.tar.gz
frameworks_base-a7771df3696954f0e279407e8894a916a7cb26cc.tar.bz2
Move CancellationSignal to android.os package.
Bug: 6427830 Change-Id: I39451bb1e1d4a8d976ed1c671234f0c8c61658dd
Diffstat (limited to 'tools')
-rw-r--r--tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentProvider.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentProvider.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentProvider.java
index e28866e..f770ccc 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentProvider.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentProvider.java
@@ -19,7 +19,6 @@ package com.android.layoutlib.bridge.android;
import android.content.ContentProviderOperation;
import android.content.ContentProviderResult;
import android.content.ContentValues;
-import android.content.ICancellationSignal;
import android.content.IContentProvider;
import android.content.OperationApplicationException;
import android.content.res.AssetFileDescriptor;
@@ -27,6 +26,7 @@ import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
import android.os.IBinder;
+import android.os.ICancellationSignal;
import android.os.ParcelFileDescriptor;
import android.os.RemoteException;