tree 6f4de0041c81844ba61d36a18d632788ba7cd91c
parent cf3a6dc1e221fab662d1a0c1cd87220ca3a3b3c3
parent 12e5d8ec1edfd9ba0e0683be2c10add0236ca276
author Jean-Baptiste Queru <jbq@google.com> 1335902595 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335902595 -0700

am 12e5d8ec: Merge "Backup and restore original timeout"

* commit '12e5d8ec1edfd9ba0e0683be2c10add0236ca276':
  Backup and restore original timeout