OSDN Git Service

Merge "Remove agree_key and add configure to keymaster2." into nyc-dev
authorShawn Willden <swillden@google.com>
Sat, 26 Mar 2016 15:17:34 +0000 (15:17 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 26 Mar 2016 15:17:34 +0000 (15:17 +0000)

Trivial merge