tree 3f40c25153753db1b0de3519986c0c6f4bad0141
parent 9a533b4b5be4d5920262f84438c4859bbd3a63f7
parent 81268195886f11c529a6ca295200b80542a4539e
author George Burgess IV <gbiv@google.com> 1526433089 -0700
committer android-build-merger <android-build-merger@google.com> 1526433089 -0700

Merge "Fix a memory leak"
am: 8126819588

Change-Id: Ie33953edea0c4bee98fccff3bb8b80d8c0357a19