tree 19ecc8bbdcbc39352aa444d3643e84b09329d40e
parent 00bf3bd13a7e2a40b124db36ec3fd08fefaf8b92
parent ec7ba37c4102e583e5b50b737db8ceaa133ba25f
author Paul Duffin <paulduffin@google.com> 1487943503 +0000
committer android-build-merger <android-build-merger@google.com> 1487943503 +0000

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

Change-Id: Id050d56e8f8442f413f17bb89314ade516a800ac