tree 561ccc2f85b1b6f91a556d651fe6d5320d3ef3db
parent 2d0589cfef14924a8dfb6f541562ff5fe48c9b6a
parent 10a99cc9b56e6081acb094f84457b0172e38c660
author Jonathan Dixon <joth@google.com> 1386640227 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386640227 +0000

am 10a99cc9: (-s ours) am 7cf8cef2: Merge "Cherry-pick "Fix a fd leak in NPChannelBase on Posix"" into klp-dev

* commit '10a99cc9b56e6081acb094f84457b0172e38c660':