| commit | b892638044abf975e7b7e8bbbd25f5ac2d760f40 | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Thu Feb 12 19:57:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 12 19:57:51 2015 +0000 |
| tree | f389e38ff682314fd748c4824d947dac94052305 | |
| parent | eba6a9df38fdaab4d09562938a4feff08159b5d9 [diff] | |
| parent | c3d14005892efde05a7abdb476d7ffcd79fe5ff4 [diff] |
am c3d14005: Merge "Use a keystore_device for fallback to softkeymaster" * commit 'c3d14005892efde05a7abdb476d7ffcd79fe5ff4': Use a keystore_device for fallback to softkeymaster