| commit | 0189c6efed4f36db0661d827d998a49bc34ece12 | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Fri May 29 21:31:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 29 21:31:52 2015 +0000 |
| tree | 84a66049f12d6a55fcbb88c897dabb7d7e6e5920 | |
| parent | 57e82aad718f42ea12292b5c063d2c2ea1538bc4 [diff] | |
| parent | dd78330140ad0e02fc693fc1f5bf041adcf64a1f [diff] |
am dd783301: Merge "Add optional additional entropy to finish" * commit 'dd78330140ad0e02fc693fc1f5bf041adcf64a1f': Add optional additional entropy to finish