| commit | b672afaa8c4e1bd7681115eb56914b61a549b6db | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Wed Apr 29 04:54:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 29 04:54:33 2015 +0000 |
| tree | 8754f828618f181d23f398b19f47dd7a913b4ad6 | |
| parent | 9c36ee9b4f42909c1a425322e4e2d3e86dd6edc5 [diff] | |
| parent | adbbba9f1dc364e4d3911562fdb8f2e666922e2f [diff] |
am adbbba9f: Merge "Add missing error codes from keymaster_defs.h." * commit 'adbbba9f1dc364e4d3911562fdb8f2e666922e2f': Add missing error codes from keymaster_defs.h.