am 4f88ff48: Merge "Use the right fd for flush call" into jb-mr2-dev

* commit '4f88ff48ee99b5e7078f7a6b774d21a3f3434bb9':
  Use the right fd for flush call

core/java/android/net/LocalSocketImpl.java

@@ -147,7 +147,7 @@ class LocalSocketImpl
         public void flush() throws IOException {
             FileDescriptor myFd = fd;
             if (myFd == null) throw new IOException("socket closed");
-            while(pending_native(fd) > 0) {
+            while(pending_native(myFd) > 0) {
                 try {
                     Thread.sleep(10);
                 } catch (InterruptedException ie) {