Merge "Fix restore-agent timeouts"

This commit is contained in:
Christopher Tate 2011-09-07 12:05:44 -07:00 committed by Android (Google) Code Review
commit e62b818c85

Diff Content Not Available