tree 3a74f0ea6ea5d219c970cd428b35df1178eb9931
parent 77ca73f8a77b811a305a2185e797571198faab5b
parent 9a4f572a9551c925c75fb47be901813082f2a1f4
author Christopher Ferris <cferris@google.com> 1494052461 +0000
committer android-build-merger <android-build-merger@google.com> 1494052461 +0000

Merge "Small test fixes."
am: 9a4f572a95

Change-Id: I53c3ab731be17e603e455890e6ae5fb15d033c79