tree 573b8850f448c2cd2ea5bb5752aa9740f8eed711
parent d3ca5980f7d85e706d39af6da26686b6632f1d46
author Guang Zhu <guangzhu@google.com> 1472060963 -0700
committer Guang Zhu <guangzhu@google.com> 1472153866 +0000

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

Bug: 31072145
Test: make droid checkbuild

Change-Id: I1462b0ba70aa3ede1a5b2ccc407e234dea1eb1b2