| commit | d880dc2fb23aa3564c46169f7b0651bd2ca2c2de | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Fri Mar 27 21:42:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 27 21:42:08 2015 +0000 |
| tree | f5c47173a613c184e3e2c66c85cee4c55e7f891f | |
| parent | 80d5c4250f6a7b55b34bb033620df54cdbb31499 [diff] | |
| parent | 274a4ee3446e76a34a9cfe987e98f7bf4e53f78d [diff] |
am 274a4ee3: Merge "Symmetric key import for AndroidKeyStore." * commit '274a4ee3446e76a34a9cfe987e98f7bf4e53f78d': Symmetric key import for AndroidKeyStore.