am c3a2747f: am d8b525c3: Merge "Increase the default timeout from 30 to 60...
am c3a2747f: am d8b525c3: Merge "Increase the default timeout from 30 to 60 seconds." into honeycomb
* commit 'c3a2747f':
Increase the default timeout from 30 to 60 seconds.