tree cddac30f8f4713a6ef40ce4e22385157fef99d58
parent 5973926ba36e2406dcfff87cb8fd36550f8355e3
parent 7e316c05c63e57bd8232b3c5ff3a44281c97c855
author android-build-prod (mdb) <android-build-team-robot@google.com> 1524878358 -0700
committer android-build-merger <android-build-merger@google.com> 1524878358 -0700

Merge "Fix a memory leak" am: 3260678523
am: 7e316c05c6

Change-Id: Ic85922afaa66b946aa609d9d32ddc9ef72d64cda