| commit | 94269ea08086df37d4a358a802c292742cb75850 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Fri Apr 10 14:00:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 10 14:00:20 2015 +0000 |
| tree | ff544d00d0f027ae90f70d6fcda1ec229a190d66 | |
| parent | cc521eada2f2926791eb42a369a1e2151fe18a33 [diff] | |
| parent | 6950fae4646752f79f42d6a7335f58c33ce4c20d [diff] |
am 6950fae4: Merge "Simplify keymaster_key_origin_t." * commit '6950fae4646752f79f42d6a7335f58c33ce4c20d': Simplify keymaster_key_origin_t.