tree e83d7221e40c810911dd75abbed3100163a72fde
parent 34253d52cea2487953c440582f305da22ba21071
parent 4686840dfc2b37225cd8afd44319a4481a880336
author Stefan Xenos <sxenos@google.com> 1463148223 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1463148223 +0000

Merge "Delete mockito from the protobuf repository."