summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jean-Baptiste Queru <jbq@google.com> 2011-01-29 14:43:33 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-01-29 14:43:33 -0800
commit3100207be5cb0ef93a5271f24b6f03a2e75291ad (patch)
treeb9785201b81473816814f0968720276f42e8c560
parent34ebb5bfec0794d5852b47edaa8b9d4cea22e515 (diff)
parent1358b6a4fb68e81058aa938e46b125350bdf0fff (diff)
am 1358b6a4: Tweak to make merges easier
* commit '1358b6a4fb68e81058aa938e46b125350bdf0fff': Tweak to make merges easier
-rw-r--r--core/java/android/os/storage/IObbActionListener.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/os/storage/IObbActionListener.java b/core/java/android/os/storage/IObbActionListener.java
index 6a6292d63256..35da4b097ee5 100644
--- a/core/java/android/os/storage/IObbActionListener.java
+++ b/core/java/android/os/storage/IObbActionListener.java
@@ -113,7 +113,7 @@ public interface IObbActionListener extends IInterface {
_data.writeInt(nonce);
_data.writeInt(status);
mRemote.transact(Stub.TRANSACTION_onObbResult, _data, _reply,
- Binder.FLAG_ONEWAY);
+ android.os.IBinder.FLAG_ONEWAY);
_reply.readException();
} finally {
_reply.recycle();