Merge "Encryption Key size negotiation - PTS tests"

author Treehugger Robot <treehugger-gerrit@google.com>

Thu, 8 Oct 2020 16:36:06 +0000 (16:36 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Thu, 8 Oct 2020 16:36:06 +0000 (16:36 +0000)
author Treehugger Robot <treehugger-gerrit@google.com>
Thu, 8 Oct 2020 16:36:06 +0000 (16:36 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 8 Oct 2020 16:36:06 +0000 (16:36 +0000)
diff --cc gd/security/internal/security_manager_impl.cc
Simple merge
diff --cc gd/security/internal/security_manager_impl.h
Simple merge
author	Treehugger Robot <treehugger-gerrit@google.com>
	Thu, 8 Oct 2020 16:36:06 +0000 (16:36 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Thu, 8 Oct 2020 16:36:06 +0000 (16:36 +0000)
		1	2
gd/security/internal/security_manager_impl.cc	patch \|	diff1 \|	diff2 \|	blob \| history
gd/security/internal/security_manager_impl.h	patch \|	diff1 \|	diff2 \|	blob \| history