tree 2ce3add4ebe66e975e55143b3c7dc40e631b4882
parent 6929b7d70e451371cdcc9adc5b6bbab88456ab48
parent 209eff27552e1e185ea4bc19f066494e5c3d7ab5
author Daniel Xie <dxie@google.com> 1434748104 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434748104 +0000

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

* commit '209eff27552e1e185ea4bc19f066494e5c3d7ab5':
  Increase polling timeout