| commit | e8f4e671bf163da0190163e27ade884dc50884ec | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Thu Sep 17 00:58:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 17 00:58:22 2015 +0000 |
| tree | ee88d4defa8706166595ba5bacb7983746f78cf0 | |
| parent | 545f0c24fafd06dfd4263ad60f822458a23275e1 [diff] | |
| parent | cd2fff40a9069dfcc49c7e70a994b513c16f32f2 [diff] |
am cd2fff40: am 94e514eb: am e5a69c0d: Merge "Correct keymaster1 documentation." * commit 'cd2fff40a9069dfcc49c7e70a994b513c16f32f2': Correct keymaster1 documentation.