tree 95e0e5d80f342ea610da9e6a4a5d12d56aceee3d
parent 9cee5d1541e6efed76e66de9cff2eff294e774e6
parent 89bdf3ae713cf5c4d5f12b037fc8ae127af09c0c
author Chih-hung Hsieh <chh@google.com> 1536079140 -0700
committer android-build-merger <android-build-merger@google.com> 1536079140 -0700

Merge "Fix potential memory leak."
am: 89bdf3ae71

Change-Id: If83e8a7631f7cbb37b0f1724b94957a9dab347ca