tree 3afc7802b7f383745c6686c445f390717742b48a
parent 524a4957f27d85f232421fec48f6c465791edc02
parent e52e8abaa89386e31344e3e4991556c1bff05a69
author nagendra modadugu <ngm@google.com> 1515601719 -0800
committer nagendra modadugu <ngm@google.com> 1515601719 -0800

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