tree 588bfc527ef8521a9041a9c0ac6501dce9837836
parent 6981a92433fc779aba9b347b7e5b99c8807a65c9
parent aa947f15314a4239de91a1cd0bea085e3399d43e
author Alex Klyubin <klyubin@google.com> 1380839003 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380839003 -0700

am aa947f15: am a9bce468: am 84742149: Merge "Make EntropyMixer mix in output of Hardware RNG into Linux RNG."

* commit 'aa947f15314a4239de91a1cd0bea085e3399d43e':
  Make EntropyMixer mix in output of Hardware RNG into Linux RNG.