| commit | cd2fff40a9069dfcc49c7e70a994b513c16f32f2 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Thu Sep 17 00:50:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 17 00:50:55 2015 +0000 |
| tree | 8dd8ee8a174d5c341f17a341a39ddd457ffb917b | |
| parent | 06926a5777f7948d094d9b96a306b28f3e570001 [diff] | |
| parent | 94e514eb78714edd9267822a00b688b52ceeceeb [diff] |
am 94e514eb: am e5a69c0d: Merge "Correct keymaster1 documentation." * commit '94e514eb78714edd9267822a00b688b52ceeceeb': Correct keymaster1 documentation.