| commit | cc0900cd68ec033a7d45e43feabf50aadeae4f3d | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Thu Feb 12 20:01:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 12 20:01:50 2015 +0000 |
| tree | fbd45afb68a5d3eec91b1f934659a11fdc79c53a | |
| parent | d512992c4fefac2922f1181e29318780be46ad7f [diff] | |
| parent | b892638044abf975e7b7e8bbbd25f5ac2d760f40 [diff] |
am b8926380: am c3d14005: Merge "Use a keystore_device for fallback to softkeymaster" * commit 'b892638044abf975e7b7e8bbbd25f5ac2d760f40': Use a keystore_device for fallback to softkeymaster