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

* commit 'b225fa3b59f6dbe8038f67fd4513c913a92c7457':
This commit is contained in:
Dan Albert 2014-10-27 04:33:16 +00:00 committed by Android Git Automerger
commit 23c109b3b3

Diff Content Not Available