Commit 07290a7b authored Jan 07, 2014 by Dave Platt Committed by Android Git Automerger Jan 07, 2014

am 3bbf7e6a: am 62bac75d: am 76e5ca81: Fix descriptor leak after accepting connections

* commit '3bbf7e6a':
  Fix descriptor leak after accepting connections

core/java/android/net/LocalSocketImpl.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -326,6 +326,7 @@ class LocalSocketImpl
		}

		s.fd = accept(fd, s);
		s.mFdCreatedInternally = true;
		}

		/**
		@@ -536,4 +537,3 @@ class LocalSocketImpl
		close();
		}
		}