Merge "Reland allowing MockitoAnnotations.* as static import." am: 7a00bf40dc am: 6db2a96c03

am: 778e216faf

Change-Id: Idf045c0e234d14a3ba402bd10e0542fcb94ab90d
This commit is contained in:
Aurimas Liutikas
2016-11-21 18:03:36 +00:00
committed by android-build-merger

View File

@@ -16,7 +16,7 @@
--> -->
<module name="AvoidStarImport"> <module name="AvoidStarImport">
<property name="severity" value="error"/> <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>
<module name="IllegalCatch"> <module name="IllegalCatch">
<property name="severity" value="info"/> <property name="severity" value="info"/>