| commit | 72958047fb12f09813edfd6ac5e0d101976358c7 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Wed Apr 29 05:34:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 29 05:34:50 2015 +0000 |
| tree | c00b3a61ac39e9474c89b31f2f6f24c9df1fc846 | |
| parent | 2ceea2160e4ca89c426c2fcf9c77029ecf15e3e1 [diff] | |
| parent | b672afaa8c4e1bd7681115eb56914b61a549b6db [diff] |
am b672afaa: am adbbba9f: Merge "Add missing error codes from keymaster_defs.h." * commit 'b672afaa8c4e1bd7681115eb56914b61a549b6db': Add missing error codes from keymaster_defs.h.