am 0474407e: am 87ed42d0: Merge "Don\'t spuriously time out restore sessions" into honeycomb-mr1

* commit '0474407e5d99d6e78451c66703d2934adca0cec4':
  Don't spuriously time out restore sessions