tree 222b2da141e142e0b8402111efa5c7bf98111dc3
parent a1b2949be2a1de3b48efe70780c5721f15d69265
parent ec813c4e358d54d03ff4f642e2656732d501f824
author Paul Crowley <paulcrowley@google.com> 1468439642 +0000
committer android-build-merger <android-build-merger@google.com> 1468439642 +0000

Merge \"Run secdiscard on encrypted key and key blob too\" into nyc-mr1-dev
am: ec813c4e35

Change-Id: I8507fdc7e183a53d3bb129ed346cb649eddffff5