tree 3058d3543c0a543d7e1da043e1512b3daa40a1c8
parent 1d17298958b9dd51da13ab81fe1f9a2d39df6bb1
parent 1c35b48253f8caba7df1f2ba7dbafc1113010a6e
author Tao Bao <tbao@google.com> 1485926455 +0000
committer android-build-merger <android-build-merger@google.com> 1485926455 +0000

Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: 7ab9c3812d am: 29ef12f777
am: 1c35b48253

Change-Id: Ic23c7a580b346220485c913e98304c5a3cf05026