tree a14464123bebfff64910d7c44b1759a699a6caa8
parent 07966c62f1db24a1a2bd6577f2ff4dc8a4c9ca08
parent ddd5680e8fac9661f1141c3acd60d0207ff38cc0
author Christopher Tate <ctate@google.com> 1299202393 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1299202393 -0800

Merge "Don't spuriously time out restore sessions" into honeycomb-mr1