tree bed6ce53f6b1debb88137bf179b80181a3df499e
parent c070f7588be4c2a663a5b66592b655c3c817a54f
parent 8879ee4a78bec7c12fbfc1a1074a0951197117b6
author Adam Vartanian <flooey@google.com> 1537868026 -0700
committer android-build-merger <android-build-merger@google.com> 1537868026 -0700

Merge "Inline two short methods from Conscrypt" am: 9da9b33cc2 am: 91d61ea0ed
am: 8879ee4a78

Change-Id: Iffbb91414c16b055fc3358e83fb5c23ef4998816