OSDN Git Service

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

Change-Id: Iac921cc46b197cf7ec3b2b26ec6c393ce69226bd


Trivial merge