| commit | ea5cf7564d245ee60515c22d4e774a693154ca31 | [log] [tgz] |
|---|---|---|
| author | Jonathan Dixon <joth@google.com> | Tue Dec 10 01:50:27 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 10 01:50:27 2013 +0000 |
| tree | 561ccc2f85b1b6f91a556d651fe6d5320d3ef3db | |
| parent | 2d0589cfef14924a8dfb6f541562ff5fe48c9b6a [diff] | |
| parent | 10a99cc9b56e6081acb094f84457b0172e38c660 [diff] |
am 10a99cc9: (-s ours) am 7cf8cef2: Merge "Cherry-pick "Fix a fd leak in NPChannelBase on Posix"" into klp-dev * commit '10a99cc9b56e6081acb094f84457b0172e38c660':