| commit | 0acfbbeb53bb7222609ee769f815d81a94635a55 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Fri Apr 10 14:19:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 10 14:19:38 2015 +0000 |
| tree | f46162af53107d59ccae54779274ace82f927395 | |
| parent | e006d2ad901b7eac7c0906d252a6788c150c0437 [diff] | |
| parent | 94269ea08086df37d4a358a802c292742cb75850 [diff] |
am 94269ea0: am 6950fae4: Merge "Simplify keymaster_key_origin_t." * commit '94269ea08086df37d4a358a802c292742cb75850': Simplify keymaster_key_origin_t.