tree c2f391191102c5fae613758f80ec4d3f860c7231
parent 22ef3ed3055ff668089853bd6e1e685a2e4cef45
parent d29c902f9822ab4b11dd4b91729c64d6987cdf29
author Dave Burke <daveburke@google.com> 1411760006 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1411760007 +0000

Merge "Revert "Fix memory leak where we close the descriptor instead of the file."" into lmp-dev