| commit | 3e83ea3f117e3509bcd869141abf2fe0302d0264 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Mon Jun 01 15:26:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 15:26:25 2015 +0000 |
| tree | 16f8047bfd72445a01a24afac01ec7ab150ef526 | |
| parent | f3853332a4d59a5448cc95c22e33ccee66b83e53 [diff] | |
| parent | 97e7fec63ca3c72516e478b158e9673bdfc0118f [diff] |
am 97e7fec6: am 1a23c317: Merge "Add algorithm aliases for Android Keystore HMACs." into mnc-dev * commit '97e7fec63ca3c72516e478b158e9673bdfc0118f': Add algorithm aliases for Android Keystore HMACs.