| commit | 4eaef9a79173336047cc662a51729437ac4a130d | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Fri Sep 11 22:36:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 11 22:36:21 2015 +0000 |
| tree | d7027277f707537575ef7b83425df5d3153eacfd | |
| parent | 5a18649bb14daaf8013e260c293031a8611fb66d [diff] | |
| parent | b9b5d86b0e2a7e32259f2606024745439ebb43e1 [diff] |
am b9b5d86b: resolved conflicts for b15e1ff5 to stage-aosp-master * commit 'b9b5d86b0e2a7e32259f2606024745439ebb43e1': Update KeymasterDefs