tree 7a2789a65f254fbf9cb1a6403b73e6723e19fd76
parent d68e4e45b08d137cc33f36a5cd896ecdfd57b693
parent 6721b0295f41eb7060fb84b8f33702a1bcafb2e0
author Marco Nelissen <marcone@google.com> 1494950190 +0000
committer android-build-merger <android-build-merger@google.com> 1494950190 +0000

Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca am: 4bd7103388 am: dd2f7e982f am: 00be42f32c am: e4b59cb256 am: 15f2244696
am: 6721b0295f

Change-Id: I56cc783d993f01ee26df858151d1ee649ee62c51