| commit | 629d2d27f44798e3cf58f4671560ac04c4b59fe7 | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Tue Mar 10 19:51:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 10 19:51:54 2015 +0000 |
| tree | 4adddd7ac6c93e1871210b808bac64a67cd8cf0a | |
| parent | 0d03a496110f58f28a85e4d1e5e8640fcc589c61 [diff] | |
| parent | f9a96d81ea7aef01ba41fce714fdc480ae785694 [diff] |
am f9a96d81: am b0f70423: Merge "Implement keymaster 1.0 add_rng_entropy" * commit 'f9a96d81ea7aef01ba41fce714fdc480ae785694': Implement keymaster 1.0 add_rng_entropy