| commit | 9f429a9054d37299c2fd2e4b2687fd0a7ccab4eb | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Fri May 29 21:36:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 29 21:36:09 2015 +0000 |
| tree | 9599ced598590a59c14b3da6f4a43b39e495b9f8 | |
| parent | 6ca760ac2b8b9b63b7cab422aec6977320c3c80f [diff] | |
| parent | 4673027c75ae95de9ea468d4722a39e4434596ac [diff] |
am 4673027c: Merge "Add optional additional entropy to finish" * commit '4673027c75ae95de9ea468d4722a39e4434596ac': Add optional additional entropy to finish