diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-05-08 10:51:12 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-08 10:51:12 -0700 |
| commit | 947f1c8db00bd3805838ff49a5f4d220df507b47 (patch) | |
| tree | 706e6101ae3e5bfb31b505d11e429256e33580cd /tools | |
| parent | 6d6d186cd1a5df5fff73c8a731a81a9da3fea13b (diff) | |
| parent | a7771df3696954f0e279407e8894a916a7cb26cc (diff) | |
| download | frameworks_base-947f1c8db00bd3805838ff49a5f4d220df507b47.zip frameworks_base-947f1c8db00bd3805838ff49a5f4d220df507b47.tar.gz frameworks_base-947f1c8db00bd3805838ff49a5f4d220df507b47.tar.bz2 | |
Merge "Move CancellationSignal to android.os package." into jb-dev
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentProvider.java | 2 |
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; |