| commit | 57c61ddc0ce9709a962f9d9026b47246a47f7406 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Wed Oct 29 07:00:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:00:36 2014 +0000 |
| tree | ed3309220f8de14057fbb64ce1fd57e423076a3b | |
| parent | 6c9a78ec44640bec8e04317788e0405c4705f207 [diff] | |
| parent | eb819f75ae440b39b441cff73808df5641286139 [diff] |
am eb819f75: am a39da5a2: Fallback to software keystore on import_key failure * commit 'eb819f75ae440b39b441cff73808df5641286139':