| commit | 7760820ecc636b2a065b20eec8422d4deaf0141c | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Fri Mar 27 23:49:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 27 23:49:25 2015 +0000 |
| tree | a53d5129c538f4d858f524ba1bfde0d9021cb509 | |
| parent | 2fb1d0eb206714f79a93cf717d704a4330bb6f1e [diff] | |
| parent | 23c2b8e81ec5a6e0c344f09e728d87300ac29bc2 [diff] |
am 23c2b8e8: am d7e06104: am 36ee836d: Merge "Symmetric key generation for AndroidKeyStore." * commit '23c2b8e81ec5a6e0c344f09e728d87300ac29bc2': Symmetric key generation for AndroidKeyStore.