summaryrefslogtreecommitdiffstats
path: root/samples
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-07-23 19:20:32 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-23 19:20:32 +0000
commit155d41a0f29ebe895f32d9c42e47e56acf0be59c (patch)
treeeae7db04eade716a4b0f2f90d45465c6041138b4 /samples
parente1ebca6c1ecbec72e89b9f621592de41cb184d7e (diff)
parent304b01c2493f16c2537563b3e00e4770765942a2 (diff)
downloadframeworks_base-155d41a0f29ebe895f32d9c42e47e56acf0be59c.zip
frameworks_base-155d41a0f29ebe895f32d9c42e47e56acf0be59c.tar.gz
frameworks_base-155d41a0f29ebe895f32d9c42e47e56acf0be59c.tar.bz2
am 304b01c2: Merge "Document what algorithms Android Keystore supports." into mnc-dev
* commit '304b01c2493f16c2537563b3e00e4770765942a2': Document what algorithms Android Keystore supports.
Diffstat (limited to 'samples')
0 files changed, 0 insertions, 0 deletions