tree 873cd708d3c6fb36684c53bc506ff3940c3ec3f0
parent a7b13a9be885f7471bd449ddaa57ff7a92114c0b
parent 0d446c0a6f5ab27bf24d8e046f1d03ce40f09594
author Paul Duffin <paulduffin@google.com> 1487943319 +0000
committer android-build-merger <android-build-merger@google.com> 1487943319 +0000

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

Change-Id: I91bce7a26df4532d6926910885171249e6336a5f