tree 4fa3e8d4ca4eb22bf191b4075d33694e6d305d99
parent c85b00aa34e729f63c9d5140f86cf22019750ab5
parent 43a62f7d247d5da809185b8473b88afe25f3c13e
author Paul Duffin <paulduffin@google.com> 1481811810 +0000
committer android-build-merger <android-build-merger@google.com> 1481811810 +0000

Merge "Remove hamcrest-integration" am: f1015b50e7 am: 013fc08d6f
am: 43a62f7d24

Change-Id: Ic5fb12f67a5dd7eba52b853d3516fbf41b5e54af