tree b633d2e367844b64db5e637e33a9e64ef8658414
parent a1dea123ea34c9d163925b3d88e7ac3ff102ec4c
parent 01c560f4af25c4a2d006b844d79f09458deec9a4
author Guang Zhu <guangzhu@google.com> 1472157744 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1472157752 +0000

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