tree 551dab4cc61f7612b775731c19b5aae16dfd6654
parent 809f24d5c6b60b6ce4443994634966fee05963de
parent aec5a14e6cc0464b157a5b098d056ed17c39a579
author Alex Klyubin <klyubin@google.com> 1437714868 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437714868 +0000

am aec5a14e: am 6d8cf7a7: am bb320299: am 155d41a0: am 304b01c2: Merge "Document what algorithms Android Keystore supports." into mnc-dev

* commit 'aec5a14e6cc0464b157a5b098d056ed17c39a579':
  Document what algorithms Android Keystore supports.