tree fe844337b1e23190cf916a523df60d2026c84abf
parent 0094c2363729d003f3170718e26cef2b49bdf81a
parent 8dadf1fd7745c419153109b56616de98d5cc916b
author Christopher Ferris <cferris@google.com> 1517891478 +0000
committer android-build-merger <android-build-merger@google.com> 1517891478 +0000

Merge "Small test clean up." am: 8ca50401f5 am: b523a6a616
am: 8dadf1fd77

Change-Id: Ie8b9050e503c30d5b2e11748e9d53c24360ea7e4