| commit | 662c326e5fc02fa11226de1267b7f60485f5638a | [log] [tgz] |
|---|---|---|
| author | Vinit Deshapnde <vinitd@google.com> | Mon Sep 23 17:46:00 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Sep 23 17:46:00 2013 +0000 |
| tree | f22f31a4fd69cc53d817510c9db106a5ced38273 | |
| parent | 75256476c87cc8c4f7e5124c9b944c37b2f51d3d [diff] | |
| parent | 2871588101c9bf1e6c9573599dee9be106466175 [diff] |
Merge "Allow yet another combination of key management options" into klp-dev