tree c943ef6426c373006eda0dfd137bed3dcb7e7d30
parent d4c13f281206c8f2a5d56141dcd3ab9e169e4aa1
parent a4abf50c684223b81e8fdc1e26af5bd56ae83429
author Paul Duffin <paulduffin@google.com> 1487943322 +0000
committer android-build-merger <android-build-merger@google.com> 1487943322 +0000

Merge changes from topic 'upgrade-hamcrest-to-2.0' am: a565149246
am: a4abf50c68

Change-Id: If9cdccb1d27c91084021e481b998fddb860a84c2