| commit | f5cb96cfbbd2a7148b4b337097c94bea3f52d5f3 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Tue Jun 17 19:13:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 17 19:13:58 2014 +0000 |
| tree | e6cda57429240deef098fc7084b2079ea7b3a638 | |
| parent | aa3ebacd4f7cd7ecf02291114c109a4cd3d1d27a [diff] | |
| parent | 51736de19a4c225a54cda73754d0f57aa68def4f [diff] |
am 51736de1: am 4c488cca: Merge "[Asset Manager] Fix memory leakage bug" * commit '51736de19a4c225a54cda73754d0f57aa68def4f': [Asset Manager] Fix memory leakage bug
diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp index b4d482a..87164ca 100644 --- a/libs/androidfw/AssetManager.cpp +++ b/libs/androidfw/AssetManager.cpp
@@ -1747,6 +1747,7 @@ } mergeInfoLocked(pMergedInfo, pContents); + delete pContents; return true; }