commit 939461300a0283a9f370a0425d4061d32b36f952
author Dianne Hackborn <hackbod@google.com> Mon May 23 14:08:12 2011 -0700
committer Dianne Hackborn <hackbod@google.com> Mon May 23 14:10:26 2011 -0700
tree 41e7c361f261448cb511fa97324b7648a4fe8cc2
parent bdd8a16282cf85bfdbe4c15adcd5c37db772de11
parent 070a19e035cd28f2a0cc831f2322f2121d80de44

resolved conflicts for merge of 070a19e0 to master

Change-Id: I855ab02a4e8dd465af67fd23b66c0dace76bd411

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index dd619cf..3339497 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -13924,12 +13924,14 @@
 
   public class ParcelFileDescriptor implements android.os.Parcelable {
     ctor public ParcelFileDescriptor(android.os.ParcelFileDescriptor);
+    method public static android.os.ParcelFileDescriptor adoptFd(int);
     method public void close() throws java.io.IOException;
     method public static android.os.ParcelFileDescriptor[] createPipe() throws java.io.IOException;
     method public int describeContents();
     method public int detachFd();
     method public static android.os.ParcelFileDescriptor dup(java.io.FileDescriptor) throws java.io.IOException;
     method public static android.os.ParcelFileDescriptor fromDatagramSocket(java.net.DatagramSocket);
+    method public static android.os.ParcelFileDescriptor fromFd(int) throws java.io.IOException;
     method public static android.os.ParcelFileDescriptor fromSocket(java.net.Socket);
     method public int getFd();
     method public java.io.FileDescriptor getFileDescriptor();