| commit | d7cc04b275ea6d1cec863159327281b0ffbc8120 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Sat Feb 14 00:53:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Feb 14 00:53:14 2015 +0000 |
| tree | 3de3562ea66760e0694a634c3ea878673cdcd9e2 | |
| parent | 4c2059d8fbefad3d3f3c37079819ea8205809b17 [diff] | |
| parent | 6bdaf827ef59975efbf73b2d5b4228fb61c36123 [diff] |
am 6bdaf827: Merge "Add explicit values to keymaster_key_format_t" * commit '6bdaf827ef59975efbf73b2d5b4228fb61c36123': Add explicit values to keymaster_key_format_t