| commit | 5d4ee176fb9b9c48505476a2200e20ecaca90353 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Sat Feb 14 01:04:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Feb 14 01:04:48 2015 +0000 |
| tree | f150380722deb2ed4d63d640b7cc23cec5c3849f | |
| parent | 8c0e65b45d8aad43e6530094496af9962ee50ec3 [diff] | |
| parent | d7cc04b275ea6d1cec863159327281b0ffbc8120 [diff] |
am d7cc04b2: am 6bdaf827: Merge "Add explicit values to keymaster_key_format_t" * commit 'd7cc04b275ea6d1cec863159327281b0ffbc8120': Add explicit values to keymaster_key_format_t