tree 406762d846ccd12c9bd70a677cfb534d1904550c
parent 801525ceccf3b8d68b9b561116a734598c52c547
parent 3f9dd287b99340efaaa257759e71a8f81b2ed113
author Jeff Brown <jeffbrown@google.com> 1310425211 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1310425211 -0700

Merge "Increase activity timeouts when using a wrapper process."