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:49:52 +0000 (19:49 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 13 Jul 2016 19:49:52 +0000 (19:49 +0000)

Trivial merge