tree 11269e792f1ec175ac568cae8a09d7916006e645
parent e259ceef2576204ee4fac69e9603d72fa6d2d333
author Guang Zhu <guangzhu@google.com> 1472060964 -0700
committer Guang Zhu <guangzhu@google.com> 1472154187 +0000

Avoid JUnit4 collision in android-support-test, mockito-target

Bug: 31072145
Test: make droid checkbuild

Change-Id: Id3c0c66de8d82418f7ae2ac4b72607956f56f0c3