tree c50dc934b91f48859828e51460422cc872dafb64
parent e0895660dac3fc87665d2cf7b0ca6906ab89cec1
parent 83a86c5ce4c04c6e885b08dbdf4a07a18371a3e5
author Alex Klyubin <klyubin@google.com> 1431020319 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1431020320 +0000

Merge "Always mix in additional entropy into keymaster." into mnc-dev