| commit | 7cfdf040fde78b5bcbe23223f6e3501beddf671d | [log] [tgz] |
|---|---|---|
| author | Paul Duffin <paulduffin@google.com> | Tue Jan 10 10:33:09 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Jan 10 10:33:09 2017 +0000 |
| tree | f32ad1cdf945bc0319c6a505033aa00ff8605757 | |
| parent | 26401927b83770db45f00706ccc589955644c6c2 [diff] | |
| parent | a0b1fd6752e65aaeaddb1684cdbb1baabfa85433 [diff] |
Merge changes from topic 'upgrade-junit4.12' * changes: Extra generic type information to aid certain javacs. Revert matchers back to 4.10 to compile against Hamcrest 1.1 Remove support for stuck threads Remove DisableOnDebug (new in 4.12) as it is not supported on Android Upgrade to JUnit 4.12