tree 762849d22bfba9b5474f94b7ddc477e201ed39e1
parent 581cc1ee59d01fe4b4a31618ab4aedfa639e42b0
parent 8a07701f3817ad0b76b82cfc464868e8f57e359d
author Chad Brubaker <cbrubaker@google.com> 1433447307 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1433447309 +0000

Merge "Add optional additional entropy to finish" into mnc-dev