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