tree b6dccd160d2a9e5d1b61373d117bcdf2aef869a3
parent 4bd7103388c9f76dccc78eb6a3120fa630a00250
parent cbaad4b189c8566318bdb148cf905fe2b333b8ed
author Marco Nelissen <marcone@google.com> 1496376932 +0000
committer android-build-merger <android-build-merger@google.com> 1496376932 +0000

Merge "Fix potential leak" into klp-dev am: 2f9eacc3ae am: a7602f8339 am: fe7c2700ae
am: cbaad4b189

Change-Id: Ifd9897d7c631c92e756481c3f43f0b4cbca85ca0