| commit | 10914a23f71b42a2b9d08a0199689d84117d5e0c | [log] [tgz] |
|---|---|---|
| author | Vinit Deshapnde <vinitd@google.com> | Mon Sep 23 18:59:02 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 23 18:59:02 2013 -0700 |
| tree | 417ae5d26854a3817911af0de3fc5f0c319e13a5 | |
| parent | 05b51688f656700f3b5a06ea9664c88215a07494 [diff] | |
| parent | 662c326e5fc02fa11226de1267b7f60485f5638a [diff] |
am 662c326e: Merge "Allow yet another combination of key management options" into klp-dev * commit '662c326e5fc02fa11226de1267b7f60485f5638a': Allow yet another combination of key management options