tree 2cc2e14291367f833d2b98cda6323ba1131e0523
parent 4660eb658930cf25e7a75e474b87942915f378d3
parent d5aa44fdf2f0dfd37e6fbfddc87eaccbfa4438e0
author David Pursehouse <dpursehouse@collab.net> 1578962769 +0900
committer David Pursehouse <dpursehouse@collab.net> 1578962769 +0900

Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Replace ExpectedException with assertThrows

Change-Id: I8ba9ecef9ad3d966fb400ebde9aa1db35e4d938c