OSDN Git Service

am 304b01c2: Merge "Document what algorithms Android Keystore supports." into mnc-dev
authorAlex Klyubin <klyubin@google.com>
Thu, 23 Jul 2015 19:20:32 +0000 (19:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Jul 2015 19:20:32 +0000 (19:20 +0000)
commit155d41a0f29ebe895f32d9c42e47e56acf0be59c
treeeae7db04eade716a4b0f2f90d45465c6041138b4
parente1ebca6c1ecbec72e89b9f621592de41cb184d7e
parent304b01c2493f16c2537563b3e00e4770765942a2
am 304b01c2: Merge "Document what algorithms Android Keystore supports." into mnc-dev

* commit '304b01c2493f16c2537563b3e00e4770765942a2':
  Document what algorithms Android Keystore supports.