| commit | fee999e3d21cbd36b5f1b251252518fa627c1c61 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Tue Dec 15 22:34:13 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Dec 15 22:34:13 2015 +0000 |
| tree | 6486efd56d449add2878c04d7cd6a7f5ac30c22f | |
| parent | d3fcf19518ffa654b90b8ebd568f592b8ff69ac3 [diff] | |
| parent | 453bccade97fd879429a8d2bc8ccb1c8f726cc7b [diff] |
Merge "Make use of keystore and keymaster names consistent. Also fix bugs."