tree 502c9a259dee9278743de65395c0b0b3ec9f41a2
parent 2cd8ac6b239d75c2ff3c0bac41cf5e954329af4b
parent d2ceb69c5e593d26b415db0a401c32e432055e0e
author Marc Fisher <fisherii@google.com> 1436905904 -0700
committer Marc Fisher <fisherii@google.com> 1436905904 -0700

Merge pull request #87 from DrMarcII/matcher

Change Clock.waitFor to support both unittest-based and matcher-based matchers.