| commit | e0e8aa1ebca8608ac50f20b3ad069bb95a0e5962 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Wed Apr 01 02:20:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 01 02:20:40 2015 +0000 |
| tree | 9ec7090eba50589a60ea00e17c2a75d01ff71053 | |
| parent | 787bacd35a9d53c76f27ba565e5d5d97f86b73fd [diff] | |
| parent | c230e1908f6307913e5af644a6594cc0f9f3fb93 [diff] |
am c230e190: am 9c0f257f: am 19e79e12: Merge "Add SecretKeyFactory backed by AndroidKeyStore." * commit 'c230e1908f6307913e5af644a6594cc0f9f3fb93': Add SecretKeyFactory backed by AndroidKeyStore.