| commit | 99f4ac144506d307b38ab112d1054e5fe18a7217 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Fri Apr 10 21:51:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 10 21:51:22 2015 +0000 |
| tree | b550314a40c2666e3541e8c355ff9d607ba2ee93 | |
| parent | 6159f6eb231028bc6420edf4157fb335e78aca00 [diff] | |
| parent | 97fce66f7d6c5803dfa49f7ab9a0d9e9b009082f [diff] |
am 97fce66f: Merge "Make several key crypto parameters repeatable" * commit '97fce66f7d6c5803dfa49f7ab9a0d9e9b009082f': Make several key crypto parameters repeatable