commit | 72f7df8c97b5189eb83bfdb140adefde3d8c7554 | [log] [tgz] |
---|---|---|
author | Shawn Willden <swillden@google.com> | Thu Aug 27 12:17:33 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:17:33 2015 +0000 |
tree | 05cbf3106bfecaa475bd48ba1fd0bedf3743bc09 | |
parent | cc37d52de89b008fc385bfffa3d04b23f4392041 [diff] | |
parent | 3941b52ed118cc9432fa7f46750776d581e52b18 [diff] |
am 3941b52e: (-s ours) am df5eec89: Merge "Revert "Revert "Report keymaster0 keys as hardware-backed, origin unknown.""" into mnc-dev * commit '3941b52ed118cc9432fa7f46750776d581e52b18':