tree 3f4b716009ad89e4146f5984bf6db23f1d412ffd
parent bd4b1bad48662057a44cdaaef3c0fc8c07739a31
parent 809062c26da5daeec6f3bb144a37b5cff589c937
author Joachim Sauer <jsauer@google.com> 1512385970 +0000
committer android-build-merger <android-build-merger@google.com> 1512385970 +0000

Merge "Adjust tests to new android-support-test + espresso libraries."
am: 809062c26d  -s ours

Change-Id: I9691f0221998569194b453619e90a214776ae6ab