| commit | 2f0a46cf4fd7f3b7de613f92abf0bec36a499d0e | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Fri Mar 27 23:31:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 27 23:31:38 2015 +0000 |
| tree | 13768986b9f3385123d66e9c4b991d05ece2420d | |
| parent | 42e9344d51b3d6718200dc19782a650a1cbd3f6c [diff] | |
| parent | 8e7df37c9af178cd443c487f258773c0017501aa [diff] |
am 8e7df37c: am d880dc2f: am 274a4ee3: Merge "Symmetric key import for AndroidKeyStore." * commit '8e7df37c9af178cd443c487f258773c0017501aa': Symmetric key import for AndroidKeyStore.