| commit | 8e7df37c9af178cd443c487f258773c0017501aa | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Fri Mar 27 23:13:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 27 23:13:24 2015 +0000 |
| tree | 8f4ba279d693218e68f60bd1cbf23a6d73be7c42 | |
| parent | c1c3b88ebd853425e931a5c07a045bae6ac1085f [diff] | |
| parent | d880dc2fb23aa3564c46169f7b0651bd2ca2c2de [diff] |
am d880dc2f: am 274a4ee3: Merge "Symmetric key import for AndroidKeyStore." * commit 'd880dc2fb23aa3564c46169f7b0651bd2ca2c2de': Symmetric key import for AndroidKeyStore.