tree ad7ca406cf119f21c5c2b924d24ccd108378dee1
parent 165bb5e4ebfb2580d3f3489b8b669e2eca1bb3ef
parent a40a647371087e466a22bc9448d933daf7a674f7
author Irfan Sheriff <isheriff@google.com> 1339530372 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339530372 -0700

am a40a6473: Merge "Increase time  out for CTS" into jb-dev

* commit 'a40a647371087e466a22bc9448d933daf7a674f7':
  Increase time  out for CTS