OSDN Git Service

Merge "keymaster: add flags indicating feature support"
authorKenny Root <kroot@google.com>
Fri, 18 Apr 2014 18:50:01 +0000 (18:50 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 18 Apr 2014 18:50:01 +0000 (18:50 +0000)

Trivial merge