| commit | 99a9c5b0d59ed70d5beb6c48c6882977970a991c | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Fri Sep 11 22:43:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 11 22:43:41 2015 +0000 |
| tree | 372d116998ee21a0c20faeaa1ec178d11d76ff04 | |
| parent | b1e6e010d920f50e08b18b8e05780c93b355e638 [diff] | |
| parent | 4eaef9a79173336047cc662a51729437ac4a130d [diff] |
am 4eaef9a7: am b9b5d86b: resolved conflicts for b15e1ff5 to stage-aosp-master * commit '4eaef9a79173336047cc662a51729437ac4a130d': Update KeymasterDefs