tree 242a45aefb340f48cdc8baa8b23a09063aeef7f0
parent cc9495bf505933fd16a7a1e9c8c901cfc15acdba
parent 02402075ff472dc0f21c12ec7a7e0f48180db18f
author Irfan Sheriff <isheriff@google.com> 1339532103 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339532103 -0700

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

* commit '02402075ff472dc0f21c12ec7a7e0f48180db18f':
  Increase time  out for CTS