OSDN Git Service

Merge "Update KeymasterDefs"
authorShawn Willden <swillden@google.com>
Fri, 11 Sep 2015 13:21:15 +0000 (13:21 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 11 Sep 2015 13:21:15 +0000 (13:21 +0000)

Trivial merge