| commit | 97e7fec63ca3c72516e478b158e9673bdfc0118f | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Fri May 29 19:22:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 29 19:22:11 2015 +0000 |
| tree | 5e8cfff9e0c703557eebd8675777ac2b782949e7 | |
| parent | af739a10cf15c00467b90aaccc4907ce460e64de [diff] | |
| parent | 1a23c31752f1295c708cf749a7828dc42e4e9d9e [diff] |
am 1a23c317: Merge "Add algorithm aliases for Android Keystore HMACs." into mnc-dev * commit '1a23c31752f1295c708cf749a7828dc42e4e9d9e': Add algorithm aliases for Android Keystore HMACs.