commit 1358b6a4fb68e81058aa938e46b125350bdf0fff
author Jean-Baptiste Queru <jbq@google.com> Sat Jan 29 12:53:52 2011 -0800
committer Jean-Baptiste Queru <jbq@google.com> Sat Jan 29 12:54:09 2011 -0800
tree 1f514c73a548f4d27b6ab679600dc02eb9694bdd
parent 6b739dc7292452227cdd8abd90658f4db8f0ce70

Tweak to make merges easier

Bug: 3364311

Change-Id: Idec05206615de524a3b61d8579d9f2b462b541cd

core/java/android/os/storage/IObbActionListener.java

diff --git a/core/java/android/os/storage/IObbActionListener.java b/core/java/android/os/storage/IObbActionListener.java
index 6a6292d..35da4b0 100644
--- a/core/java/android/os/storage/IObbActionListener.java
+++ b/core/java/android/os/storage/IObbActionListener.java
@@ -113,7 +113,7 @@
                     _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();