tree c32a685150b6b49004aeaf3579ef13e211f7c347
parent 0eabebebd291affe923b47c06119c4c271b64f9e
author Brett Chabot <brettchabot@android.com> 1315948153 -0700
committer Brett Chabot <brettchabot@android.com> 1315948153 -0700

Attempt to fix flaky tests and scripts.

Change-Id: Idcf9b85c72052924f990795c321606f9ae408ada