tree 06598f2c007662a2741782486a853dda692b674d
parent 93390229a07f338c039a752e72ae5a90d28e54cc
parent a5c7b7bb0602acfbb9941bef5b00868a56a89a6b
author Bernie Innocenti <codewiz@google.com> 1548916926 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1548916926 +0000

Merge "Avoid multiple inheritance in ResolverTest"