Merge "Reland allowing MockitoAnnotations.* as static import."

am: 7a00bf40dc

Change-Id: I7596362feebd22a724449bd98ccc34f3dbfaf629
This commit is contained in:
Aurimas Liutikas
2016-11-21 17:53:34 +00:00
committed by android-build-merger

View File

@@ -16,7 +16,7 @@
-->
<module name="AvoidStarImport">
<property name="severity" value="error"/>
<property name="excludes" value="org.junit.Assert,org.mockito.Mockito,org.hamcrest.Matchers"/>
<property name="excludes" value="org.junit.Assert,org.mockito.Mockito,org.mockito.MockitoAnnotations,org.hamcrest.Matchers"/>
</module>
<module name="IllegalCatch">
<property name="severity" value="info"/>