Commit 7cfdf040 authored by Paul Duffin's avatar Paul Duffin Committed by Gerrit Code Review
Browse files

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
parents 26401927 a0b1fd67
Expand all Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment