| commit | 6d190338fcf245774665ce4d9d9f5aa56bbc5645 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Mon Mar 04 22:45:44 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 04 22:45:44 2013 +0000 |
| tree | 0b099fe76ab99fa159579fdad1d40150ab9f251c | |
| parent | 2ba8de33eccebe967f02ca61fee3ca530cbc8f9c [diff] | |
| parent | 0e5b5f6619f45db6cdff7757d208c197a3d4a3b1 [diff] |
am 0e5b5f66: am 0841c4cb: Merge "EntropyMixer: Write entropy at shutdown / reboot / power" into jb-mr2-dev * commit '0e5b5f6619f45db6cdff7757d208c197a3d4a3b1': EntropyMixer: Write entropy at shutdown / reboot / power