| commit | d059031c73c5d387f8d3a2fa2e14f24b81dbd326 | [log] [tgz] |
|---|---|---|
| author | Guang Zhu <guangzhu@google.com> | Thu Aug 25 20:42:24 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 25 20:42:32 2016 +0000 |
| tree | b633d2e367844b64db5e637e33a9e64ef8658414 | |
| parent | a1dea123ea34c9d163925b3d88e7ac3ff102ec4c [diff] | |
| parent | 01c560f4af25c4a2d006b844d79f09458deec9a4 [diff] |
Merge "Avoid JUnit4 collision in android-support-test, mockito-target"