tree 873cd708d3c6fb36684c53bc506ff3940c3ec3f0
parent 9432ade17c16656f8c3ebbe2b7f3081a93c52d4d
parent c2e228b07b9dd8266a6eeabb34e27233733ef127
author Paul Duffin <paulduffin@google.com> 1487943499 +0000
committer android-build-merger <android-build-merger@google.com> 1487943499 +0000

Merge changes from topic 'upgrade-hamcrest-to-2.0' am: f324aac9e2 am: 0d446c0a6f
am: c2e228b07b

Change-Id: I737b987a8b22811c7ea058bcd9898b58694b58ce