| commit | fba667fca3fce012bc5d4703f0e2d4f3ef06cfb6 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Tue May 06 22:03:40 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 06 22:03:40 2014 +0000 |
| tree | 2e72be7fead8fcd9df2885e7fdd735b0ff26ef09 | |
| parent | a7700b7300b4c136c34ecdacfe6bd581357ede88 [diff] | |
| parent | bb15653d4ffdb14082d091a303e946a010154544 [diff] |
am bb15653d: Merge "Add support for specifying which key types are supported" * commit 'bb15653d4ffdb14082d091a303e946a010154544': Add support for specifying which key types are supported