tree c943ef6426c373006eda0dfd137bed3dcb7e7d30
parent 44deb443eba961ee519dbbfacfb919dcee95dda0
parent a5651492460e782407cbbd7beac5f6c0c7915958
author Paul Duffin <paulduffin@google.com> 1487943180 +0000
committer android-build-merger <android-build-merger@google.com> 1487943180 +0000

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

Change-Id: I07fbfb874b63dda6e1c2ebf19c75cff709059779