tree 11f8692e4cbcda693b5a4e25b36e1ea1e93b7dbc
parent 848519fcfaa0cd1de4b022e4b23b3181a81a756d
parent 83b649ee1dee78919f4ee9341cbf7939d3bb2edb
author Tao Bao <tbao@google.com> 1480541964 +0000
committer android-build-merger <android-build-merger@google.com> 1480541964 +0000

Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: d255b661a1 am: be54feda58
am: 83b649ee1d

Change-Id: I785c6ec399ee2695af9276b47559f93d7d010a48