tree a3cc06dc52242e000500d1f31d9e4b99b16c72bc
parent 6230870839a9b9eaadb8441933cc81eebac89165
parent 83ca015933455e825ecbf46cc8d1eb944dacd45d
author George Burgess IV <gbiv@google.com> 1479272157 +0000
committer android-build-merger <android-build-merger@google.com> 1479272157 +0000

Merge "Fix static-analyzer memory leak warnings." am: ba27872adb am: 283c74c540 am: c458028f69
am: 83ca015933

Change-Id: I5d09e7951892a0c0b3ff81d19f1c6167402db226