am 55833709: am c52e54c4: Merge "Some more test cleanup."

* commit '55833709ab4b8e6f85d19be0a5b1a096277a2dc2':
This commit is contained in:
Dan Albert 2014-10-27 04:18:32 +00:00 committed by Android Git Automerger
commit b225fa3b59

Diff Content Not Available