| commit | 61758696a0ddc0ba7b1253d3da048b73af8fe698 | [log] [tgz] |
|---|---|---|
| author | nagendra modadugu <ngm@google.com> | Wed Jan 10 08:28:39 2018 -0800 |
| committer | nagendra modadugu <ngm@google.com> | Wed Jan 10 08:28:39 2018 -0800 |
| tree | 3afc7802b7f383745c6686c445f390717742b48a | |
| parent | 524a4957f27d85f232421fec48f6c465791edc02 [diff] | |
| parent | e52e8abaa89386e31344e3e4991556c1bff05a69 [diff] |
Merge remote-tracking branch 'goog/upstream-master' into nos-merge-upstream * goog/upstream-master: keymaster: add TUP related definitions keymaster: update prototype for SymmetricKey Change-Id: I4e9c3f513aadbb13330ff39dea4715ae7ebaefe5