tree ff544d00d0f027ae90f70d6fcda1ec229a190d66
parent 3f3b9790739a287223cfd63bc72e6b19635dced5
parent 8d6cf2594c9524205a6f5823378d1b983a1ad073
author Shawn Willden <swillden@google.com> 1428673596 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1428673596 +0000

Merge "Simplify keymaster_key_origin_t."