| commit | ad93dc7f5cfda67c1b4043a102f0f3246ee1fef1 | [log] [tgz] |
|---|---|---|
| author | Vinit Deshapnde <vinitd@google.com> | Tue Sep 24 10:22:18 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 24 10:22:18 2013 -0700 |
| tree | 0a89e9b515802a170915444f0783405efe844667 | |
| parent | 9f584e576f1511b96a599244474035249f0c498e [diff] | |
| parent | 10914a23f71b42a2b9d08a0199689d84117d5e0c [diff] |
am 10914a23: am 662c326e: Merge "Allow yet another combination of key management options" into klp-dev * commit '10914a23f71b42a2b9d08a0199689d84117d5e0c': Allow yet another combination of key management options