OSDN Git Service

Merge \"Run secdiscard on encrypted key and key blob too\" into nyc-mr1-dev
authorPaul Crowley <paulcrowley@google.com>
Wed, 13 Jul 2016 19:54:02 +0000 (19:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 13 Jul 2016 19:54:02 +0000 (19:54 +0000)
am: ec813c4e35

Change-Id: I8507fdc7e183a53d3bb129ed346cb649eddffff5


Trivial merge