Merge "Stub Binder API." am: 4db1632b3a am: 313456c975

am: c61a8e01a3

Change-Id: Id40456a710ce24f1af98b8e70a894a1fbe8d0690

core/java/android/os/Binder.java

@@ -129,6 +129,17 @@ public class Binder implements IBinder {
         return sTransactionTracker;
     }
 
+    /** @hide */
+    public static IBinder allowBlocking(IBinder binder) {
+        // NOTE: real implementation on internal branch
+        return binder;
+    }
+
+    /** @hide */
+    public static void copyAllowBlocking(IBinder fromBinder, IBinder toBinder) {
+        // NOTE: real implementation on internal branch
+    }
+
     /* mObject is used by native code, do not remove or rename */
     private long mObject;
     private IInterface mOwner;