| commit | fc0bc7374ff769fd069e7fb0f4e4f7643b52916a | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Mon Mar 16 17:37:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 16 17:37:45 2015 +0000 |
| tree | c060674431c372ff50dc06e0dfb069d6dd6cbfb6 | |
| parent | 24ccd8ac92863b63965b285d304ca07a29c02052 [diff] | |
| parent | 1bc16e463e34d2959a3382014289e3a3a5b83eef [diff] |
am 1bc16e46: Merge "Implement keymaster 1.0 generate_key method" * commit '1bc16e463e34d2959a3382014289e3a3a5b83eef': Implement keymaster 1.0 generate_key method