tree e9855b0753a74d10fc7f1e68d7e87a27569adf70
parent eb7207dbcd987801a746cff8aa0b78183950c8fa
parent 6deffe3c3ba8e85ba0cecff97ebf43863f625f3f
author Ting-Yuan Huang <laszio@google.com> 1502904851 +0000
committer android-build-merger <android-build-merger@google.com> 1502904851 +0000

Merge "Fix a potential memory leak" am: f583ff660e am: 6677429bff
am: 6deffe3c3b

Change-Id: Ifcd960527a5da12e136ba96062460208368aafea