tree 8b09394bcb91326b9db68196c244e4654c7e4560
parent eb44d8146b8d1123699f75498b802ff7cac0f54f
parent 1156db460edb4334ee9d678070327163b1479312
author Chad Brubaker <cbrubaker@google.com> 1475094095 +0000
committer android-build-merger <android-build-merger@google.com> 1475094095 +0000

Merge "keystore: fix memory leak from readKeymasterBlob" am: 3746fcf327
am: 1156db460e

Change-Id: I6d6aa111778048b93602a8edae50a2851190fbe0