tree 42ecaa24894dc2dd56f6eebe8145920256e60c68
parent 5fdaa5f335e26086b6a594dff8a5d9d6bdddd3bc
parent f2568a5d11c78242d4f6e819a63fb9de5c32819f
author Daniel Xie <dxie@google.com> 1434749858 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434749858 +0000

am f2568a5d: am 43cf00fe: am 209eff27: am abd0f1de: Merge "Increase polling timeout" into lollipop-mr1-cts-dev

* commit 'f2568a5d11c78242d4f6e819a63fb9de5c32819f':
  Increase polling timeout