| commit | 3080ea76d2c8b823444a1cab9ec0fcd042f7d01c | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Wed May 07 19:37:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 07 19:37:18 2014 +0000 |
| tree | 2e72be7fead8fcd9df2885e7fdd735b0ff26ef09 | |
| parent | c30aaf8cbfaa33cacce6291ec32475f866fd30ef [diff] | |
| parent | fba667fca3fce012bc5d4703f0e2d4f3ef06cfb6 [diff] |
am fba667fc: am bb15653d: Merge "Add support for specifying which key types are supported" * commit 'fba667fca3fce012bc5d4703f0e2d4f3ef06cfb6': Add support for specifying which key types are supported