tree 5862b78d667371e87353d024d877a07edf11fa94
parent af40b4e5a4778313433ce9612c51ba367acf8d66
parent efb9743f24044390273be6722656c2bf3ffddc7d
author Irfan Sheriff <isheriff@google.com> 1351714706 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351714706 -0700

am efb9743f: am 86c93df1: Merge "Increase timeouts for p2p" into jb-mr1-dev

* commit 'efb9743f24044390273be6722656c2bf3ffddc7d':
  Increase timeouts for p2p